Changeset 3480:caab53a59052

Timestamp:

2003-09-19 06:03:25 (5 years ago)

Author:

Mads Martin Joergensen <mmj@…>

Branch:

HEAD

Message:

As the ones of you who compile with new gcc's probably have noticed,
there's a lot of type-punning in Mutt. With help from Philipp
Thomas, I've fixed all I could find in CVS (please double-check, one
might have slipped through the cracks), I can make one for 1.4 CVS
branch as well if wanted.

Files:

• addrbook.c (modified) (1 diff)
• browser.c (modified) (1 diff)
• color.c (modified) (1 diff)
• compose.c (modified) (4 diffs)
• copy.c (modified) (5 diffs)
• crypt.c (modified) (1 diff)
• curs_lib.c (modified) (1 diff)
• edit.c (modified) (4 diffs)
• enter.c (modified) (5 diffs)
• handler.c (modified) (4 diffs)
• imap/browse.c (modified) (1 diff)
• imap/command.c (modified) (2 diffs)
• lib.c (modified) (4 diffs)
• lib.h (modified) (2 diffs)
• mh.c (modified) (1 diff)
• mutt_idna.c (modified) (3 diffs)
• mx.c (modified) (1 diff)
• pager.c (modified) (6 diffs)
• parse.c (modified) (1 diff)
• pgp.c (modified) (1 diff)
• pgpkey.c (modified) (1 diff)
• pop_lib.c (modified) (2 diffs)
• query.c (modified) (1 diff)
• recvattach.c (modified) (1 diff)
• remailer.c (modified) (2 diffs)
• rfc1524.c (modified) (1 diff)
• rfc2047.c (modified) (3 diffs)
• rfc2231.c (modified) (1 diff)
• sendlib.c (modified) (8 diffs)
• smime.c (modified) (1 diff)
• thread.c (modified) (1 diff)

addrbook.c

@@ -165 +165 @@
   }
 
-  safe_realloc ((void **) &AliasTable, menu->max * sizeof (ALIAS *));
+  safe_realloc (&AliasTable, menu->max * sizeof (ALIAS *));
   menu->data = AliasTable;
 

browser.c

@@ -308 +308 @@
   {
     /* need to allocate more space */
-    safe_realloc ((void **) &state->entry,
+    safe_realloc (&state->entry,
                   sizeof (struct folder_file) * (state->entrymax += 256));
     memset (&state->entry[state->entrylen], 0,

color.c

@@ -738 +738 @@
     if (q_level >= ColorQuoteSize)
     {
-      safe_realloc ((void **) &ColorQuote, (ColorQuoteSize += 2) * sizeof (int));
+      safe_realloc (&ColorQuote, (ColorQuoteSize += 2) * sizeof (int));
       ColorQuote[ColorQuoteSize-2] = ColorDefs[MT_COLOR_QUOTED];
       ColorQuote[ColorQuoteSize-1] = ColorDefs[MT_COLOR_QUOTED];

compose.c

@@ -754 +754 @@
         if (idxlen == idxmax)
         {
-          safe_realloc ((void **) &idx, sizeof (ATTACHPTR *) * (idxmax += 5));
+          safe_realloc (&idx, sizeof (ATTACHPTR *) * (idxmax += 5));
           menu->data = idx;
         }
@@ -801 +801 @@
           if (idxlen + numfiles >= idxmax)
           {
-            safe_realloc ((void **) &idx, sizeof (ATTACHPTR *) * (idxmax += 5 + numfiles));
+            safe_realloc (&idx, sizeof (ATTACHPTR *) * (idxmax += 5 + numfiles));
             menu->data = idx;
           }
@@ -900 +900 @@
           if (idxlen + Context->tagged >= idxmax)
           {
-            safe_realloc ((void **) &idx, sizeof (ATTACHPTR *) * (idxmax += 5 + Context->tagged));
+            safe_realloc (&idx, sizeof (ATTACHPTR *) * (idxmax += 5 + Context->tagged));
             menu->data = idx;
           }
@@ -1169 +1169 @@
           if (idxlen == idxmax)
           {
-            safe_realloc ((void **) &idx, sizeof (ATTACHPTR *) * (idxmax += 5));
+            safe_realloc (&idx, sizeof (ATTACHPTR *) * (idxmax += 5));
             menu->data = idx;
           }

copy.c

@@ -151 +151 @@
         else 
         {
-          safe_realloc ((void **) &headers[x], mutt_strlen (headers[x]) + 
+          safe_realloc (&headers[x], mutt_strlen (headers[x]) + 
                         mutt_strlen (this_one) + sizeof (char));
           strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */
@@ -218 +218 @@
       else
       {
-        safe_realloc ((void **) &this_one, 
+        safe_realloc (&this_one,
                       mutt_strlen (this_one) + mutt_strlen (buf) + sizeof (char));
         strcat (this_one, buf); /* __STRCAT_CHECKED__ */
@@ -238 +238 @@
     else 
     {
-      safe_realloc ((void **) &headers[x], mutt_strlen (headers[x]) + 
+      safe_realloc (&headers[x], mutt_strlen (headers[x]) + 
                     mutt_strlen (this_one) + sizeof (char));
       strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */
@@ -796 +796 @@
   
   
-  safe_realloc ((void **) h, buflen);
+  safe_realloc (h, buflen);
   for (count = 0; a; a = a->next, count++)
   {
@@ -828 +828 @@
     
     buflen += l + mutt_strlen (cbuf) + mutt_strlen (c2buf);
-    safe_realloc ((void **) h, buflen);
+    safe_realloc (h, buflen);
     strcat (*h, cbuf);          /* __STRCAT_CHECKED__ */
     strcat (*h, buf);           /* __STRCAT_CHECKED__ */

crypt.c

@@ -767 +767 @@
     {
       if((*n % 5) == 0)
-        safe_realloc ((void **) signatures, (*n + 6) * sizeof (BODY **));
+        safe_realloc (signatures, (*n + 6) * sizeof (BODY **));
 
       (*signatures)[(*n)++] = a;

curs_lib.c

@@ -453 +453 @@
 
   if (UngetCount >= UngetBufLen)
-    safe_realloc ((void **) &KeyEvent, (UngetBufLen += 128) * sizeof(event_t));
+    safe_realloc (&KeyEvent, (UngetBufLen += 128) * sizeof(event_t));
 
   KeyEvent[UngetCount++] = tmp;

edit.c

@@ -78 +78 @@
     bytes -= mutt_strlen (p);
     if (*bufmax == *buflen)
-      safe_realloc ((void **)&buf, sizeof (char *) * (*bufmax += 25));
+      safe_realloc (&buf, sizeof (char *) * (*bufmax += 25));
     buf[(*buflen)++] = safe_strdup (tmp);
   }
   if (buf && *bufmax == *buflen) { /* Do not smash memory past buf */
-    safe_realloc ((void **)&buf, sizeof (char *) * (++*bufmax));
+    safe_realloc (&buf, sizeof (char *) * (++*bufmax));
   }
   if (buf) buf[*buflen] = NULL;
@@ -161 +161 @@
 
       if (*bufmax == *buflen)
-        safe_realloc ((void **) &buf, sizeof (char *) * (*bufmax += 25));
+        safe_realloc ( &buf, sizeof (char *) * (*bufmax += 25));
       buf[(*buflen)++] = safe_strdup (tmp);
 
@@ -176 +176 @@
 
       if (*bufmax == *buflen)
-        safe_realloc ((void **)&buf, sizeof (char *) * (*bufmax += 25));
+        safe_realloc (&buf, sizeof (char *) * (*bufmax += 25));
       buf[(*buflen)++] = safe_strdup ("\n");
     }
@@ -466 +466 @@
       strncat (tmp, "\n", sizeof(tmp)); tmp[sizeof(tmp) - 1] = '\0';
       if (buflen == bufmax)
-        safe_realloc ((void **)&buf, sizeof (char *) * (bufmax += 25));
+        safe_realloc (&buf, sizeof (char *) * (bufmax += 25));
       buf[buflen++] = safe_strdup (tmp[1] == '~' ? tmp + 1 : tmp);
     }

enter.c

@@ -133 +133 @@
     {
       wbuflen = i + 20;
-      safe_realloc ((void **) &wbuf, wbuflen * sizeof (*wbuf));
+      safe_realloc (&wbuf, wbuflen * sizeof (*wbuf));
     }
     wbuf[i++] = wc;
@@ -159 +159 @@
   {
     state->wbuflen = state->curpos + savelen;
-    safe_realloc ((void **) &state->wbuf, state->wbuflen * sizeof (wchar_t));
+    safe_realloc (&state->wbuf, state->wbuflen * sizeof (wchar_t));
   }
 
@@ -474 +474 @@
             {
               templen = state->lastchar - i;
-              safe_realloc ((void **) &tempbuf, templen * sizeof (wchar_t));
+              safe_realloc (&tempbuf, templen * sizeof (wchar_t));
             }
             else
@@ -539 +539 @@
             {
               templen = state->lastchar;
-              safe_realloc ((void **) &tempbuf, templen * sizeof (wchar_t));
+              safe_realloc (&tempbuf, templen * sizeof (wchar_t));
               memcpy (tempbuf, state->wbuf, templen * sizeof (wchar_t));
             }
@@ -672 +672 @@
         {
           state->wbuflen = state->lastchar + 20;
-          safe_realloc ((void **) &state->wbuf, state->wbuflen * sizeof (wchar_t));
+          safe_realloc (&state->wbuf, state->wbuflen * sizeof (wchar_t));
         }
         memmove (state->wbuf + state->curpos + 1, state->wbuf + state->curpos, (state->lastchar - state->curpos) * sizeof (wchar_t));

handler.c

@@ -588 +588 @@
     {
       stte->line_max = stte->line_used;
-      safe_realloc ((void **) &stte->line, stte->line_max + 1);
+      safe_realloc (&stte->line, stte->line_max + 1);
     }
     strcat (stte->line, stte->buffer);  /* __STRCAT_CHECKED__ */
@@ -607 +607 @@
     {
       if (stte->param_used + 1 >= stte->param_len)
-        safe_realloc ((void **) &stte->param, (stte->param_len += STRING));
+        safe_realloc (&stte->param, (stte->param_len += STRING));
 
       stte->param[stte->param_used++] = c;
@@ -618 +618 @@
   {
     stte->buff_len += LONG_STRING;
-    safe_realloc ((void **) &stte->buffer, stte->buff_len + 1);
+    safe_realloc (&stte->buffer, stte->buff_len + 1);
   }
 
@@ -674 +674 @@
   {
     stte->buff_len += LONG_STRING;
-    safe_realloc ((void **) &stte->buffer, stte->buff_len + 1);
+    safe_realloc (&stte->buffer, stte->buff_len + 1);
   }
   c = s;

imap/browse.c

@@ -358 +358 @@
   if (state->entrylen + 1 == state->entrymax)
   {
-    safe_realloc ((void **) &state->entry,
+    safe_realloc (&state->entry,
       sizeof (struct folder_file) * (state->entrymax += 256));
     memset (state->entry + state->entrylen, 0,

imap/command.c

@@ -106 +106 @@
     if (len == cmd->blen)
     {
-      safe_realloc ((void**) &cmd->buf, cmd->blen + IMAP_CMD_BUFSIZE);
+      safe_realloc (&cmd->buf, cmd->blen + IMAP_CMD_BUFSIZE);
       cmd->blen = cmd->blen + IMAP_CMD_BUFSIZE;
       dprint (3, (debugfile, "imap_cmd_step: grew buffer to %u bytes\n",
@@ -130 +130 @@
   if ((cmd->blen > IMAP_CMD_BUFSIZE) && (len <= IMAP_CMD_BUFSIZE))
   {
-    safe_realloc ((void**) &cmd->buf, IMAP_CMD_BUFSIZE);
+    safe_realloc (&cmd->buf, IMAP_CMD_BUFSIZE);
     cmd->blen = IMAP_CMD_BUFSIZE;
     dprint (3, (debugfile, "imap_cmd_step: shrank buffer to %u bytes\n", cmd->blen));

lib.c

@@ -87 +87 @@
 }
 
-void safe_realloc (void **p, size_t siz)
+void safe_realloc (void *ptr, size_t siz)
 {
   void *r;
+  void **p = (void **)ptr;
 
   if (siz == 0)
@@ -119 +120 @@
 }
 
-void safe_free (void **p)
-{
+void safe_free (void *ptr)
+{
+  void **p = (void **)ptr;
   if (*p)
   {
@@ -161 +163 @@
 {
   if (!p || !*p) return;
-  safe_realloc ((void **) p, strlen (*p) + 1);
+  safe_realloc (p, strlen (*p) + 1);
 }
 
@@ -493 +495 @@
         offset = *size - 1; /* overwrite the terminating 0 */
         *size += STRING;
-        safe_realloc ((void **) &s, *size);
+        safe_realloc (&s, *size);
       }
     }

lib.h

@@ -77 +77 @@
 
 
-# define FREE(x) safe_free((void **)x)
+# define FREE(x) safe_free(x)
 # define NONULL(x) x?x:""
 # define ISSPACE(c) isspace((unsigned char)c)
@@ -144 +144 @@
 void mutt_str_adjust (char **p);
 void mutt_unlink (const char *);
-void safe_free (void **);
-void safe_realloc (void **, size_t);
+void safe_free (void *);
+void safe_realloc (void *, size_t);
 
 #endif

mh.c

@@ -71 +71 @@
   {
     newmax = i + 128;
-    safe_realloc ((void **) &mhs->flags,
-                  sizeof (mhs->flags[0]) * (newmax + 1));
+    safe_realloc (&mhs->flags, sizeof (mhs->flags[0]) * (newmax + 1));
     for (j = mhs->max + 1; j <= newmax; j++)
       mhs->flags[j] = 0;

mutt_idna.c

@@ -158 +158 @@
     else
     {
-      safe_realloc ((void **) &a->mailbox, mutt_strlen (user) + mutt_strlen (tmp) + 2);
+      safe_realloc (&a->mailbox, mutt_strlen (user) + mutt_strlen (tmp) + 2);
       sprintf (a->mailbox, "%s@%s", NONULL(user), NONULL(tmp)); /* __SPRINTF_CHECKED__ */
     }
@@ -187 +187 @@
     if (mutt_idna_to_local (domain, &tmp, 0) == 0)
     {
-      safe_realloc ((void **) &a->mailbox, mutt_strlen (user) + mutt_strlen (tmp) + 2);
+      safe_realloc (&a->mailbox, mutt_strlen (user) + mutt_strlen (tmp) + 2);
       sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
     }
@@ -221 +221 @@
   }
   
-  safe_realloc ((void **) &buff, mutt_strlen (tmp) + mutt_strlen (user) + 2);
+  safe_realloc (&buff, mutt_strlen (tmp) + mutt_strlen (user) + 2);
   sprintf (buff, "%s@%s", NONULL(user), NONULL(tmp)); /* __SPRINTF_CHECKED__ */
   FREE (&tmp);

mx.c

@@ -1540 +1540 @@
   if (ctx->hdrs)
   {
-    safe_realloc ((void **) &ctx->hdrs, sizeof (HEADER *) * (ctx->hdrmax += 25));
-    safe_realloc ((void **) &ctx->v2r, sizeof (int) * ctx->hdrmax);
+    safe_realloc (&ctx->hdrs, sizeof (HEADER *) * (ctx->hdrmax += 25));
+    safe_realloc (&ctx->v2r, sizeof (int) * ctx->hdrmax);
   }
   else

pager.c

@@ -759 +759 @@
         {
           lineInfo[i].chunks = 0;
-          safe_realloc ((void **) &(lineInfo[n].syntax), 
+          safe_realloc (&(lineInfo[n].syntax), 
                         sizeof (struct syntax_t));
         }
@@ -834 +834 @@
             {
               if (++(lineInfo[n].chunks) > 1)
-                safe_realloc ((void **)&(lineInfo[n].syntax), 
+                safe_realloc (&(lineInfo[n].syntax), 
                               (lineInfo[n].chunks) * sizeof (struct syntax_t));
             }
@@ -1218 +1218 @@
   if (*last == *max)
   {
-    safe_realloc ((void **)lineInfo, sizeof (struct line_t) * (*max += LINES));
+    safe_realloc (lineInfo, sizeof (struct line_t) * (*max += LINES));
     for (ch = *last; ch < *max ; ch++)
     {
@@ -1291 +1291 @@
     {
       if (++((*lineInfo)[n].search_cnt) > 1)
-        safe_realloc ((void **) &((*lineInfo)[n].search),
+        safe_realloc (&((*lineInfo)[n].search),
                       ((*lineInfo)[n].search_cnt) * sizeof (struct syntax_t));
       else
@@ -1790 +1790 @@
           lineInfo[i].quote = NULL;
 
-          safe_realloc ((void **)&(lineInfo[i].syntax),
+          safe_realloc (&(lineInfo[i].syntax),
                         sizeof (struct syntax_t));
           if (SearchCompiled && lineInfo[i].search)
@@ -2291 +2291 @@
             lineInfo[i].quote = NULL;
 
-            safe_realloc ((void **)&(lineInfo[i].syntax), sizeof (struct syntax_t));
+            safe_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t));
             if (SearchCompiled && lineInfo[i].search)
                 FREE (&(lineInfo[i].search));

parse.c

@@ -78 +78 @@
       /* grow the buffer */
       *linelen += STRING;
-      safe_realloc ((void **) &line, *linelen);
+      safe_realloc (&line, *linelen);
       buf = line + offset;
     }

pgp.c

@@ -1107 +1107 @@
   bypass_selection:
     keylist_size += mutt_strlen (keyID) + 4;
-    safe_realloc ((void **)&keylist, keylist_size);
+    safe_realloc (&keylist, keylist_size);
     sprintf (keylist + keylist_used, "%s0x%s", keylist_used ? " " : "", /* __SPRINTF_CHECKED__ */
              keyID);

pgpkey.c

@@ -475 +475 @@
       {
         keymax += 5;
-        safe_realloc ((void **) &KeyTable, sizeof (pgp_key_t) * keymax);
+        safe_realloc (&KeyTable, sizeof (pgp_key_t) * keymax);
       }
       

pop_lib.c

@@ -115 +115 @@
   else
   {
-    safe_realloc ((void **) &pop_data->auth_list,
+    safe_realloc (&pop_data->auth_list,
             strlen (pop_data->auth_list) + strlen (line) + 2);
     strcat (pop_data->auth_list, " ");  /* __STRCAT_CHECKED__ */
@@ -411 +411 @@
     }
 
-    safe_realloc ((void **) &inbuf, lenbuf + sizeof (buf));
+    safe_realloc (&inbuf, lenbuf + sizeof (buf));
   }
 

query.c

@@ -384 +384 @@
 
                 /* append */
-                safe_realloc ((void **)&QueryTable, menu->max * sizeof (ENTRY));
+                safe_realloc (&QueryTable, menu->max * sizeof (ENTRY));
 
                 menu->data = QueryTable;

recvattach.c

@@ -111 +111 @@
     if (*idxlen == *idxmax)
     {
-      safe_realloc ((void **) &idx, sizeof (ATTACHPTR *) * ((*idxmax) += 5));
+      safe_realloc (&idx, sizeof (ATTACHPTR *) * ((*idxmax) += 5));
       for (i = *idxlen; i < *idxmax; i++)
         idx[i] = NULL;

remailer.c

@@ -105 +105 @@
   {
     *slots += 5;
-    safe_realloc ((void **) type2_list, sizeof (REMAILER *) * (*slots));
+    safe_realloc (type2_list, sizeof (REMAILER *) * (*slots));
   }
   
@@ -233 +233 @@
     return;
   
-  safe_realloc ((void **) coordsp, sizeof (struct coord) * chain->cl);
+  safe_realloc (coordsp, sizeof (struct coord) * chain->cl);
   
   coords = *coordsp;

rfc1524.c

@@ -293 +293 @@
           {
             len = mutt_strlen (test_command) + STRING;
-            safe_realloc ((void **) &test_command, len);
+            safe_realloc (&test_command, len);
             rfc1524_expand_command (a, a->filename, type, test_command, len);
             if (mutt_system (test_command))