Changeset fa4562c

Timestamp:

Aug 15, 2009, 7:08:18 PM (14 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:

e19eb97

Parents:

65b2173

git-author:

Anders Kaseorg <andersk@mit.edu> (08/04/09 02:59:42)

git-committer:

Anders Kaseorg <andersk@mit.edu> (08/15/09 19:08:18)

Message:

Prepare code for adding const qualifiers for char * and void *.

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

Files:

• aim.c (modified) (1 diff)
• cmd.c (modified) (1 diff)
• commands.c (modified) (2 diffs)
• obarray.c (modified) (1 diff)
• perlconfig.c (modified) (4 diffs)
• util.c (modified) (2 diffs)
• variable.c (modified) (2 diffs)
• zephyr.c (modified) (1 diff)

aim.c

@@ -1671 +1671 @@
   for (i=0; i<num; i++) {
     owl_function_debugmsg("  %s", &SNs[i*(MAXSNLEN+1)]);
-    owl_list_append_element(&list, &SNs[i*(MAXSNLEN+1)]);
+    owl_list_append_element(&list, (void *)&SNs[i*(MAXSNLEN+1)]);
   }
   owl_function_aimsearch_results(address, &list);

cmd.c

@@ -211 +211 @@
         return NULL;
       }
-      ival = strtol(argv[1], &ep, 10);
+      ival = strtol(argv[1], (char **)&ep, 10);
       if (*ep || ep==argv[1]) {
         owl_function_makemsg("Invalid argument '%s' for %s command.", argv[1], argv[0]);

commands.c

@@ -2465 +2465 @@
   }
   filtname = owl_view_get_filtname(owl_global_get_current_view(&g));
-  if (filtname) filtname = owl_strdup(filtname);
-  return filtname;
+  if (filtname) return owl_strdup(filtname);
+  return NULL;
 }
 
@@ -2566 +2566 @@
   }
   stylename = owl_view_get_style_name(owl_global_get_current_view(&g));
-  if (stylename) stylename = owl_strdup(stylename);
-  return stylename;
+  if (stylename) return owl_strdup(stylename);
+  return NULL;
 }
 

obarray.c

@@ -55 +55 @@
   i = owl_obarray_lookup(oa, string, &v);
   if(!v) {
-    v = owl_strdup(string);
-    owl_list_insert_element(&(oa->strings), i, v);
+    char *v2 = owl_strdup(string);
+    owl_list_insert_element(&(oa->strings), i, v2);
+    return v2;
   }
   return v;

perlconfig.c

@@ -26 +26 @@
   HV *h, *stash;
   SV *hr;
-  char *ptr, *blessas, *type;
+  char *type;
+  char *ptr, *utype, *blessas;
   int i, j;
   owl_pair *pair;
@@ -95 +96 @@
   type = owl_message_get_type(m);
   if(!type || !*type) type = "generic";
-  type = owl_strdup(type);
-  type[0] = toupper(type[0]);
-  blessas = owl_sprintf("BarnOwl::Message::%s", type);
+  utype = owl_strdup(type);
+  utype[0] = toupper(type[0]);
+  blessas = owl_sprintf("BarnOwl::Message::%s", utype);
 
   hr = newRV_noinc((SV*)h);
@@ -106 +107 @@
   }
   hr = sv_bless(hr,stash);
-  owl_free(type);
+  owl_free(utype);
   owl_free(blessas);
   return hr;
@@ -312 +313 @@
   owl_global_set_no_have_config(&g);
 
-  ret=perl_parse(p, owl_perl_xs_init, 2, args, NULL);
+  ret=perl_parse(p, owl_perl_xs_init, 2, (char **)args, NULL);
   if (ret || SvTRUE(ERRSV)) {
     err=owl_strdup(SvPV_nolen(ERRSV));

util.c

@@ -561 +561 @@
 {
   char buff[LINE], *text;
-  char *backupfilename="";
+  char *backupfilename=NULL;
   FILE *file, *backupfile=NULL;
   int size, newline;
@@ -650 +650 @@
   char *start, *end;
 
-  start = class;
-  while(!strncmp(start, "un", 2)) {
-    start += 2;
-  }
-
-  start = owl_strdup(start);
+  while(!strncmp(class, "un", 2)) {
+    class += 2;
+  }
+
+  start = owl_strdup(class);
   end = start + strlen(start) - 1;
   while(end > start && *end == 'd' && *(end-1) == '.') {

variable.c

@@ -905 +905 @@
   int i;
   char *ep = "x";
-  i = strtol(newval, &ep, 10);
+  i = strtol(newval, (char **)&ep, 10);
   if (*ep || ep==newval) return(-1);
   return (v->set_fn(v, &i));
@@ -1015 +1015 @@
   int numfailed=0;
   char buf[1024];
-  owl_variable * v;
+  void *v;
 
   in_regtest = 1;

zephyr.c

@@ -1211 +1211 @@
 
   /* bail immeaditly if we don't have to do any work */
-  ptr=strchr(in, '.');
-  if (!strchr(in, '/') && !ptr) {
+  ptr=strchr(out, '.');
+  if (!strchr(out, '/') && !ptr) {
     /* no '/' and no '.' */
     return(out);
   }
-  if (ptr && strchr(in, '@') && (ptr > strchr(in, '@'))) {
+  if (ptr && strchr(out, '@') && (ptr > strchr(out, '@'))) {
     /* There's a '.' but it's in the realm */
     return(out);
   }
-  if (!strncasecmp(in, OWL_WEBZEPHYR_PRINCIPAL, strlen(OWL_WEBZEPHYR_PRINCIPAL))) {
+  if (!strncasecmp(out, OWL_WEBZEPHYR_PRINCIPAL, strlen(OWL_WEBZEPHYR_PRINCIPAL))) {
     return(out);
   }
 
-  /* remove the realm from ptr, but hold on to it */
+  /* remove the realm from out, but hold on to it */
   realm=strchr(out, '@');
   if (realm) realm[0]='\0';