Changeset 36486be

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>

Files:

• aim.c (modified) (1 diff)
• cmd.c (modified) (3 diffs)
• functions.c (modified) (1 diff)
• keymap.c (modified) (1 diff)
• util.c (modified) (2 diffs)
• zcrypt.c (modified) (1 diff)
• zephyr.c (modified) (1 diff)
• zwrite.c (modified) (1 diff)

aim.c

@@ -943 +943 @@
   
   if (modname) {
-    if (!(filename = owl_malloc(strlen(priv->aimbinarypath)+1+strlen(modname)+4+1))) {
-      /* perror("memrequest: malloc"); */
-      return -1;
-    }
-    sprintf(filename, "%s/%s.ocm", priv->aimbinarypath, modname);
+    filename = owl_sprintf("%s/%s.ocm", priv->aimbinarypath, modname);
   } else {
-    if (!(filename = owl_malloc(strlen(priv->aimbinarypath)+1+strlen(defaultmod)+1))) {
-      /* perror("memrequest: malloc"); */
-      return -1;
-    }
-    sprintf(filename, "%s/%s", priv->aimbinarypath, defaultmod);
+    filename = owl_sprintf("%s/%s", priv->aimbinarypath, defaultmod);
   }
   

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);
 }
 

functions.c

@@ -2030 +2030 @@
 
   buff = skiptokens(buff, 1);
-  newbuff = owl_malloc(strlen(buff)+strlen(redirect)+1);
-  strcpy(newbuff, buff);
-  strcat(newbuff, redirect);
+  newbuff = owl_sprintf("%s%s", buff, redirect);
 
   if (type == 1) {

keymap.c

@@ -56 +56 @@
 char *owl_keymap_summary(const owl_keymap *km)
 {
-  char *s;
-  int slen;
   if (!km || !km->name || !km->desc) return NULL;
-  slen = strlen(km->name)+strlen(km->desc)+20;
-  s = owl_malloc(slen);
-  snprintf(s, slen-1, "%-15s - %s", km->name, km->desc);
-  return s;
+  return owl_sprintf("%-15s - %s", km->name, km->desc);
 }
 

util.c

@@ -147 +147 @@
     } else {
       args=owl_realloc(args, sizeof(char *) * (count+1));
-      args[count]=owl_malloc(strlen(foo)+1);
-      strcpy(args[count], foo);
+      args[count] = owl_strdup(foo);
       count++;
     }
@@ -325 +324 @@
       /* add the argument */
       argv=owl_realloc(argv, sizeof(char *)*((*argc)+1));
-      argv[*argc]=owl_malloc(strlen(curarg)+2);
-      strcpy(argv[*argc], curarg);
+      argv[*argc] = owl_strdup(curarg);
       *argc=*argc+1;
       strcpy(curarg, "");

zcrypt.c

@@ -245 +245 @@
     } else {
       /* Prepare result to be returned */
-      char *temp = keyfile;
-      keyfile = owl_malloc(strlen(temp) + 1);
-      if (keyfile) {
-        strcpy(keyfile, temp);
-      } else {
-        /* printf("Memory allocation error.\n"); */
-      }
+      keyfile = owl_strdup(keyfile);
     }
     

zephyr.c

@@ -988 +988 @@
 char *owl_zephyr_makesubline(const char *class, const char *inst, const char *recip)
 {
-  char *out;
-
-  out=owl_malloc(strlen(class)+strlen(inst)+strlen(recip)+30);
-  sprintf(out, "%s,%s,%s\n", class, inst, !strcmp(recip, "") ? "*" : recip);
-  return(out);
+  return owl_sprintf("%s,%s,%s\n", class, inst, !strcmp(recip, "") ? "*" : recip);
 }
 

zwrite.c

@@ -170 +170 @@
       
       /* simple hack for now to nuke stderr */
-      openline=owl_malloc(strlen(zsigproc)+40);
-      strcpy(openline, zsigproc);
-#if !(OWL_STDERR_REDIR)
-      strcat(openline, " 2> /dev/null");
+#if OWL_STDERR_REDIR
+      openline = owl_strdup(zsigproc);
+#else
+      openline = owl_sprintf("%s 2> /dev/null", zsigproc);
 #endif
       file=popen(openline, "r");