Changeset 36486be for cmd.c

Timestamp:

Aug 22, 2009, 12:50:08 AM (15 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

24ccc01

Parents:

303a9e1

git-author:

Anders Kaseorg <andersk@mit.edu> (08/22/09 00:47:21)

git-committer:

Anders Kaseorg <andersk@mit.edu> (08/22/09 00:50:08)

Message:

Replace several owl_malloc, sprintf sequences with owl_strdup or owl_sprintf.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

File:

• cmd.c (modified) (3 diffs)

cmd.c

@@ -147 +147 @@
   cmd->name = owl_strdup(name);
   cmd->cmd_aliased_to = owl_strdup(aliased_to);
-  cmd->summary = owl_malloc(strlen(aliased_to)+strlen(OWL_CMD_ALIAS_SUMMARY_PREFIX)+2);
-  strcpy(cmd->summary, OWL_CMD_ALIAS_SUMMARY_PREFIX);
-  strcat(cmd->summary, aliased_to);
+  cmd->summary = owl_sprintf("%s%s", OWL_CMD_ALIAS_SUMMARY_PREFIX, aliased_to);
   return(0);
 }
@@ -181 +179 @@
     } else {
       cmdbuffargs = skiptokens(cmdbuff, 1);
-      newcmd = owl_malloc(strlen(cmd->cmd_aliased_to)+strlen(cmdbuffargs)+2);
-      strcpy(newcmd, cmd->cmd_aliased_to);
-      strcat(newcmd, " ");
-      strcat(newcmd, cmdbuffargs);
+      newcmd = owl_sprintf("%s %s", cmd->cmd_aliased_to, cmdbuffargs);
       rv = owl_function_command(newcmd);
       owl_free(newcmd);
@@ -244 +239 @@
 /* returns a summary line describing this keymap.  the caller must free. */
 char *owl_cmd_describe(const owl_cmd *cmd) {
-  char *s;
-  int slen;
   if (!cmd || !cmd->name || !cmd->summary) return NULL;
-  slen = strlen(cmd->name)+strlen(cmd->summary)+30;
-  s = owl_malloc(slen);
-  snprintf(s, slen-1, "%-25s - %s", cmd->name, cmd->summary);
-  return s;
+  return owl_sprintf("%-25s - %s", cmd->name, cmd->summary);
 }