From: Jim Meyering Date: Mon, 9 Nov 2009 12:58:42 +0000 (+0100) Subject: convert uses of strcasecmp to STRCASEEQ X-Git-Tag: 1.0.78~24 X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=9353c6253d5fac1648b13ad9958468a2d9f6ad6f;hp=7cd4b6aeee3693463b03608a31cf53f21152c2e8;ds=sidebyside convert uses of strcasecmp to STRCASEEQ git grep -l 'strcasecmp *([^=]*== *0'| xargs \ perl -pi -e 's/\bstrcasecmp( *\(.*?\)) *== *0/STRCASEEQ$1/' --- diff --git a/daemon/checksum.c b/daemon/checksum.c index 2423265..499d19d 100644 --- a/daemon/checksum.c +++ b/daemon/checksum.c @@ -36,19 +36,19 @@ do_checksum (const char *csumtype, const char *path) int r; int len; - if (strcasecmp (csumtype, "crc") == 0) + if (STRCASEEQ (csumtype, "crc")) program = "cksum"; - else if (strcasecmp (csumtype, "md5") == 0) + else if (STRCASEEQ (csumtype, "md5")) program = "md5sum"; - else if (strcasecmp (csumtype, "sha1") == 0) + else if (STRCASEEQ (csumtype, "sha1")) program = "sha1sum"; - else if (strcasecmp (csumtype, "sha224") == 0) + else if (STRCASEEQ (csumtype, "sha224")) program = "sha224sum"; - else if (strcasecmp (csumtype, "sha256") == 0) + else if (STRCASEEQ (csumtype, "sha256")) program = "sha256sum"; - else if (strcasecmp (csumtype, "sha384") == 0) + else if (STRCASEEQ (csumtype, "sha384")) program = "sha384sum"; - else if (strcasecmp (csumtype, "sha512") == 0) + else if (STRCASEEQ (csumtype, "sha512")) program = "sha512sum"; else { reply_with_error ("unknown checksum type, expecting crc|md5|sha1|sha224|sha256|sha384|sha512"); diff --git a/daemon/debug.c b/daemon/debug.c index 8daa032..04c52f0 100644 --- a/daemon/debug.c +++ b/daemon/debug.c @@ -80,7 +80,7 @@ do_debug (const char *subcmd MAYBE_UNUSED, char *const *argv MAYBE_UNUSED) argc++; for (i = 0; cmds[i].cmd != NULL; ++i) { - if (strcasecmp (subcmd, cmds[i].cmd) == 0) + if (STRCASEEQ (subcmd, cmds[i].cmd)) return cmds[i].f (subcmd, argc, argv); } diff --git a/daemon/realpath.c b/daemon/realpath.c index 0dc5fa5..17e74ea 100644 --- a/daemon/realpath.c +++ b/daemon/realpath.c @@ -113,7 +113,7 @@ do_case_sensitive_path (const char *path) errno = 0; while ((d = readdir (dir)) != NULL) { - if (strcasecmp (d->d_name, name) == 0) + if (STRCASEEQ (d->d_name, name)) break; } diff --git a/fish/edit.c b/fish/edit.c index 1b6ce23..d30b3ca 100644 --- a/fish/edit.c +++ b/fish/edit.c @@ -88,9 +88,9 @@ do_edit (const char *cmd, int argc, char *argv[]) } /* Choose an editor. */ - if (strcasecmp (cmd, "vi") == 0) + if (STRCASEEQ (cmd, "vi")) editor = "vi"; - else if (strcasecmp (cmd, "emacs") == 0) + else if (STRCASEEQ (cmd, "emacs")) editor = "emacs -nw"; else { editor = getenv ("EDITOR"); diff --git a/fish/fish.c b/fish/fish.c index 3ab09b5..9a89f55 100644 --- a/fish/fish.c +++ b/fish/fish.c @@ -843,40 +843,40 @@ issue_command (const char *cmd, char *argv[], const char *pipecmd) r = rc_remote (remote_control, cmd, argc, argv, exit_on_error); /* Otherwise execute it locally. */ - else if (strcasecmp (cmd, "help") == 0) { + else if (STRCASEEQ (cmd, "help")) { if (argc == 0) list_commands (); else display_command (argv[0]); r = 0; } - else if (strcasecmp (cmd, "quit") == 0 || - strcasecmp (cmd, "exit") == 0 || - strcasecmp (cmd, "q") == 0) { + else if (STRCASEEQ (cmd, "quit") || + STRCASEEQ (cmd, "exit") || + STRCASEEQ (cmd, "q")) { quit = 1; r = 0; } - else if (strcasecmp (cmd, "alloc") == 0 || - strcasecmp (cmd, "allocate") == 0) + else if (STRCASEEQ (cmd, "alloc") || + STRCASEEQ (cmd, "allocate")) r = do_alloc (cmd, argc, argv); - else if (strcasecmp (cmd, "echo") == 0) + else if (STRCASEEQ (cmd, "echo")) r = do_echo (cmd, argc, argv); - else if (strcasecmp (cmd, "edit") == 0 || - strcasecmp (cmd, "vi") == 0 || - strcasecmp (cmd, "emacs") == 0) + else if (STRCASEEQ (cmd, "edit") || + STRCASEEQ (cmd, "vi") || + STRCASEEQ (cmd, "emacs")) r = do_edit (cmd, argc, argv); - else if (strcasecmp (cmd, "lcd") == 0) + else if (STRCASEEQ (cmd, "lcd")) r = do_lcd (cmd, argc, argv); - else if (strcasecmp (cmd, "glob") == 0) + else if (STRCASEEQ (cmd, "glob")) r = do_glob (cmd, argc, argv); - else if (strcasecmp (cmd, "more") == 0 || - strcasecmp (cmd, "less") == 0) + else if (STRCASEEQ (cmd, "more") || + STRCASEEQ (cmd, "less")) r = do_more (cmd, argc, argv); - else if (strcasecmp (cmd, "reopen") == 0) + else if (STRCASEEQ (cmd, "reopen")) r = do_reopen (cmd, argc, argv); - else if (strcasecmp (cmd, "sparse") == 0) + else if (STRCASEEQ (cmd, "sparse")) r = do_sparse (cmd, argc, argv); - else if (strcasecmp (cmd, "time") == 0) + else if (STRCASEEQ (cmd, "time")) r = do_time (cmd, argc, argv); else r = run_action (cmd, argc, argv); @@ -941,8 +941,8 @@ display_builtin_command (const char *cmd) { /* help for actions is auto-generated, see display_command */ - if (strcasecmp (cmd, "alloc") == 0 || - strcasecmp (cmd, "allocate") == 0) + if (STRCASEEQ (cmd, "alloc") || + STRCASEEQ (cmd, "allocate")) printf (_("alloc - allocate an image\n" " alloc \n" "\n" @@ -961,14 +961,14 @@ display_builtin_command (const char *cmd) " P or PB number of petabytes\n" " E or EB number of exabytes\n" " sects number of 512 byte sectors\n")); - else if (strcasecmp (cmd, "echo") == 0) + else if (STRCASEEQ (cmd, "echo")) printf (_("echo - display a line of text\n" " echo [ ...]\n" "\n" " This echos the parameters to the terminal.\n")); - else if (strcasecmp (cmd, "edit") == 0 || - strcasecmp (cmd, "vi") == 0 || - strcasecmp (cmd, "emacs") == 0) + else if (STRCASEEQ (cmd, "edit") || + STRCASEEQ (cmd, "vi") || + STRCASEEQ (cmd, "emacs")) printf (_("edit - edit a file in the image\n" " edit \n" "\n" @@ -982,26 +982,26 @@ display_builtin_command (const char *cmd) "\n" " NOTE: This will not work reliably for large files\n" " (> 2 MB) or binary files containing \\0 bytes.\n")); - else if (strcasecmp (cmd, "lcd") == 0) + else if (STRCASEEQ (cmd, "lcd")) printf (_("lcd - local change directory\n" " lcd \n" "\n" " Change guestfish's current directory. This command is\n" " useful if you want to download files to a particular\n" " place.\n")); - else if (strcasecmp (cmd, "glob") == 0) + else if (STRCASEEQ (cmd, "glob")) printf (_("glob - expand wildcards in command\n" " glob [ ...]\n" "\n" " Glob runs with wildcards expanded in any\n" " command args. Note that the command is run repeatedly\n" " once for each expanded argument.\n")); - else if (strcasecmp (cmd, "help") == 0) + else if (STRCASEEQ (cmd, "help")) printf (_("help - display a list of commands or help on a command\n" " help cmd\n" " help\n")); - else if (strcasecmp (cmd, "more") == 0 || - strcasecmp (cmd, "less") == 0) + else if (STRCASEEQ (cmd, "more") || + STRCASEEQ (cmd, "less")) printf (_("more - view a file in the pager\n" " more \n" "\n" @@ -1015,19 +1015,19 @@ display_builtin_command (const char *cmd) "\n" " NOTE: This will not work reliably for large files\n" " (> 2 MB) or binary files containing \\0 bytes.\n")); - else if (strcasecmp (cmd, "quit") == 0 || - strcasecmp (cmd, "exit") == 0 || - strcasecmp (cmd, "q") == 0) + else if (STRCASEEQ (cmd, "quit") || + STRCASEEQ (cmd, "exit") || + STRCASEEQ (cmd, "q")) printf (_("quit - quit guestfish\n" " quit\n")); - else if (strcasecmp (cmd, "reopen") == 0) + else if (STRCASEEQ (cmd, "reopen")) printf (_("reopen - close and reopen the libguestfs handle\n" " reopen\n" "\n" "Close and reopen the libguestfs handle. It is not necessary to use\n" "this normally, because the handle is closed properly when guestfish\n" "exits. However this is occasionally useful for testing.\n")); - else if (strcasecmp (cmd, "sparse") == 0) + else if (STRCASEEQ (cmd, "sparse")) printf (_("sparse - allocate a sparse image file\n" " sparse \n" "\n" @@ -1054,7 +1054,7 @@ display_builtin_command (const char *cmd) " P or PB number of petabytes\n" " E or EB number of exabytes\n" " sects number of 512 byte sectors\n")); - else if (strcasecmp (cmd, "time") == 0) + else if (STRCASEEQ (cmd, "time")) printf (_("time - measure time taken to run command\n" " time [ ...]\n" "\n" diff --git a/fish/more.c b/fish/more.c index 9abb51b..a32d5b4 100644 --- a/fish/more.c +++ b/fish/more.c @@ -42,7 +42,7 @@ do_more (const char *cmd, int argc, char *argv[]) } /* Choose a pager. */ - if (strcasecmp (cmd, "less") == 0) + if (STRCASEEQ (cmd, "less")) pager = "less"; else { pager = getenv ("PAGER"); diff --git a/hivex/hivex.c b/hivex/hivex.c index b20fe73..8ea2c2b 100644 --- a/hivex/hivex.c +++ b/hivex/hivex.c @@ -725,7 +725,7 @@ hivex_node_get_child (hive_h *h, hive_node_h node, const char *nname) for (i = 0; children[i] != 0; ++i) { name = hivex_node_name (h, children[i]); if (!name) goto error; - if (strcasecmp (name, nname) == 0) { + if (STRCASEEQ (name, nname)) { ret = children[i]; break; } @@ -856,7 +856,7 @@ hivex_node_get_value (hive_h *h, hive_node_h node, const char *key) for (i = 0; values[i] != 0; ++i) { name = hivex_value_key (h, values[i]); if (!name) goto error; - if (strcasecmp (name, key) == 0) { + if (STRCASEEQ (name, key)) { ret = values[i]; break; } diff --git a/src/generator.ml b/src/generator.ml index 17519fe..3a25c57 100644 --- a/src/generator.ml +++ b/src/generator.ml @@ -6430,11 +6430,11 @@ and generate_fish_cmds () = else "" in pr " if ("; - pr "strcasecmp (cmd, \"%s\") == 0" name; + pr "STRCASEEQ (cmd, \"%s\")" name; if name <> name2 then - pr " || strcasecmp (cmd, \"%s\") == 0" name2; + pr " || STRCASEEQ (cmd, \"%s\")" name2; if name <> alias then - pr " || strcasecmp (cmd, \"%s\") == 0" alias; + pr " || STRCASEEQ (cmd, \"%s\")" alias; pr ")\n"; pr " pod2text (\"%s\", _(\"%s\"), %S);\n" name2 shortdesc @@ -6692,11 +6692,11 @@ and generate_fish_cmds () = try find_map (function FishAlias n -> Some n | _ -> None) flags with Not_found -> name in pr " if ("; - pr "strcasecmp (cmd, \"%s\") == 0" name; + pr "STRCASEEQ (cmd, \"%s\")" name; if name <> name2 then - pr " || strcasecmp (cmd, \"%s\") == 0" name2; + pr " || STRCASEEQ (cmd, \"%s\")" name2; if name <> alias then - pr " || strcasecmp (cmd, \"%s\") == 0" alias; + pr " || STRCASEEQ (cmd, \"%s\")" alias; pr ")\n"; pr " return run_%s (cmd, argc, argv);\n" name; pr " else\n";