X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fmkfs.c;h=2beb82ad846204ed17da3b7e716076a3ba1f1735;hb=2109327021f4d464e2693e507fa92f1497ba0792;hp=506066f3e26e81f6be25bae3c12d2472baf7fe72;hpb=e0fb48c01f1c25c20e1d5cae0765e65d7eaa4250;p=libguestfs.git diff --git a/daemon/mkfs.c b/daemon/mkfs.c index 506066f..2beb82a 100644 --- a/daemon/mkfs.c +++ b/daemon/mkfs.c @@ -48,21 +48,21 @@ mkfs (const char *fstype, const char *device, * to every block and does bad block detection, neither of which * are useful behaviour for virtual devices. */ - if (strcmp (fstype, "ntfs") == 0) + if (STREQ (fstype, "ntfs")) argv[i++] = "-Q"; /* mkfs.reiserfs produces annoying interactive prompts unless you * tell it to be quiet. */ - if (strcmp (fstype, "reiserfs") == 0) + if (STREQ (fstype, "reiserfs")) argv[i++] = "-f"; /* Same for JFS. */ - if (strcmp (fstype, "jfs") == 0) + if (STREQ (fstype, "jfs")) argv[i++] = "-f"; /* For GFS, GFS2, assume a single node. */ - if (strcmp (fstype, "gfs") == 0 || strcmp (fstype, "gfs2") == 0) { + if (STREQ (fstype, "gfs") || STREQ (fstype, "gfs2")) { argv[i++] = "-p"; argv[i++] = "lock_nolock"; /* The man page says this is default, but it doesn't seem to be: */ @@ -83,7 +83,7 @@ mkfs (const char *fstype, const char *device, r = commandv (NULL, &err, argv); if (r == -1) { - reply_with_error ("mkfs: %s: %s: %s", fstype, device, err); + reply_with_error ("%s: %s: %s", fstype, device, err); free (err); return -1; }