[exim-cvs] cvs commit: exim/exim-src/src acl.c expand.c filt…

Startseite
Nachricht löschen
Nachricht beantworten
Autor: Philip Hazel
Datum:  
To: exim-cvs
Betreff: [exim-cvs] cvs commit: exim/exim-src/src acl.c expand.c filter.c host.c rda.c sieve.c spam.c exim/exim-src/src/auths pwcheck.c exim/exim-src/src/lookups pgsql.c
ph10 2006/09/05 15:05:43 BST

  Modified files:
    exim-src/src         acl.c expand.c filter.c host.c rda.c 
                         sieve.c spam.c 
    exim-src/src/auths   pwcheck.c 
    exim-src/src/lookups pgsql.c 
  Log:
  An update to gcc 4 threw up some new uninitialized variable and signed vs
  unsigned compiler warnings.


  Revision  Changes    Path
  1.63      +1 -1      exim/exim-src/src/acl.c
  1.3       +1 -1      exim/exim-src/src/auths/pwcheck.c
  1.59      +1 -1      exim/exim-src/src/expand.c
  1.13      +1 -1      exim/exim-src/src/filter.c
  1.25      +1 -1      exim/exim-src/src/host.c
  1.8       +2 -4      exim/exim-src/src/lookups/pgsql.c
  1.13      +1 -1      exim/exim-src/src/rda.c
  1.22      +1 -1      exim/exim-src/src/sieve.c
  1.13      +1 -1      exim/exim-src/src/spam.c


  Index: acl.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/acl.c,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- acl.c    28 Jun 2006 16:00:23 -0000    1.62
  +++ acl.c    5 Sep 2006 14:05:43 -0000    1.63
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/acl.c,v 1.62 2006/06/28 16:00:23 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/acl.c,v 1.63 2006/09/05 14:05:43 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -2363,7 +2363,7 @@
   {
   uschar *user_message = NULL;
   uschar *log_message = NULL;
  -uschar *p;
  +uschar *p = NULL;
   int rc = OK;
   #ifdef WITH_CONTENT_SCAN
   int sep = '/';


  Index: expand.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/expand.c,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- expand.c    18 Apr 2006 11:13:19 -0000    1.58
  +++ expand.c    5 Sep 2006 14:05:43 -0000    1.59
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/expand.c,v 1.58 2006/04/18 11:13:19 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/expand.c,v 1.59 2006/09/05 14:05:43 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -3662,7 +3662,7 @@
           {
           /* Handle an IP (internet) domain */


  -        if (strncmp(sub_arg[0], "inet:", 5) == 0)
  +        if (Ustrncmp(sub_arg[0], "inet:", 5) == 0)
             {
             BOOL connected = FALSE;
             int namelen, port;


  Index: filter.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/filter.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- filter.c    21 Aug 2006 11:31:43 -0000    1.12
  +++ filter.c    5 Sep 2006 14:05:43 -0000    1.13
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/filter.c,v 1.12 2006/08/21 11:31:43 fanf2 Exp $ */
  +/* $Cambridge: exim/exim-src/src/filter.c,v 1.13 2006/09/05 14:05:43 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -1433,7 +1433,7 @@
   static BOOL
   test_condition(condition_block *c, BOOL toplevel)
   {
  -BOOL yield;
  +BOOL yield = FALSE;
   const pcre *re;
   uschar *exp[2], *p, *pp;
   const uschar *regcomp_error = NULL;


  Index: host.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/host.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- host.c    4 Apr 2006 11:18:31 -0000    1.24
  +++ host.c    5 Sep 2006 14:05:43 -0000    1.25
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/host.c,v 1.24 2006/04/04 11:18:31 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/host.c,v 1.25 2006/09/05 14:05:43 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -1936,7 +1936,7 @@
        i++)
     {
     BOOL ipv4_addr;
  -  int error_num;
  +  int error_num = 0;
     struct hostent *hostdata;


     #if HAVE_IPV6


  Index: rda.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/rda.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- rda.c    7 Feb 2006 11:19:00 -0000    1.12
  +++ rda.c    5 Sep 2006 14:05:43 -0000    1.13
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/rda.c,v 1.12 2006/02/07 11:19:00 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/rda.c,v 1.13 2006/09/05 14:05:43 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -352,7 +352,7 @@


   if (rdata->isfile)
     {
  -  int yield;
  +  int yield = 0;
     data = rda_get_file_contents(rdata, options, error, &yield);
     if (data == NULL) return yield;
     }


  Index: sieve.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/sieve.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- sieve.c    25 Apr 2006 10:44:57 -0000    1.21
  +++ sieve.c    5 Sep 2006 14:05:43 -0000    1.22
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/sieve.c,v 1.21 2006/04/25 10:44:57 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/sieve.c,v 1.22 2006/09/05 14:05:43 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -2886,7 +2886,7 @@
               }
             else
               {
  -            struct String qp;
  +            struct String qp = { NULL, 0 };  /* Keep compiler happy (PH) */


               capacity = 0;
               start = reason.length;


  Index: spam.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/spam.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- spam.c    3 Jul 2006 15:19:44 -0000    1.12
  +++ spam.c    5 Sep 2006 14:05:43 -0000    1.13
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/spam.c,v 1.12 2006/07/03 15:19:44 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/spam.c,v 1.13 2006/09/05 14:05:43 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -48,7 +48,7 @@
   #endif


     /* stop compiler warning */
  -  result = result;
  +  result = 0;


     /* find the username from the option list */
     if ((user_name = string_nextinlist(&list, &sep,


  Index: pwcheck.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/auths/pwcheck.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- pwcheck.c    27 Jun 2005 14:29:44 -0000    1.2
  +++ pwcheck.c    5 Sep 2006 14:05:43 -0000    1.3
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/auths/pwcheck.c,v 1.2 2005/06/27 14:29:44 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/auths/pwcheck.c,v 1.3 2006/09/05 14:05:43 ph10 Exp $ */


   /* SASL server API implementation
    * Rob Siemborski
  @@ -183,7 +183,7 @@
                   const uschar *realm,
                   const uschar **reply)
   {
  -    uschar *daemon_reply;
  +    uschar *daemon_reply = NULL;
       int s, r;
       struct sockaddr_un srvaddr;



  Index: pgsql.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/lookups/pgsql.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- pgsql.c    14 Jul 2006 14:42:57 -0000    1.7
  +++ pgsql.c    5 Sep 2006 14:05:43 -0000    1.8
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/lookups/pgsql.c,v 1.7 2006/07/14 14:42:57 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/lookups/pgsql.c,v 1.8 2006/09/05 14:05:43 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -128,7 +128,7 @@
     server       the server string; this is in dynamic memory and can be updated
     resultptr    where to store the result
     errmsg       where to point an error message
  -  defer_break  TRUE if no more servers are to be tried after DEFER
  +  defer_break  set TRUE if no more servers are to be tried after DEFER
     do_cache     set FALSE if data is changed


   Returns:       OK, FAIL, or DEFER
  @@ -265,7 +265,6 @@
       *errmsg = string_sprintf("PGSQL connection failed: %s",
         PQerrorMessage(pg_conn));
       PQfinish(pg_conn);
  -    *defer_break = FALSE;
       goto PGSQL_EXIT;
       }


  @@ -328,7 +327,6 @@
       *errmsg = string_sprintf("PGSQL: query failed: %s (%s) (%s)\n",
                                PQresultErrorMessage(pg_result),
                                PQresStatus(PQresultStatus(pg_result)), query);
  -    *defer_break = FALSE;
       goto PGSQL_EXIT;
       }


  @@ -429,7 +427,7 @@
   while ((server = string_nextinlist(&list, &sep, buffer, sizeof(buffer)))
           != NULL)
     {
  -  BOOL defer_break;
  +  BOOL defer_break = FALSE;
     int rc = perform_pgsql_search(query, server, result, errmsg, &defer_break,
       do_cache);
     if (rc != DEFER || defer_break) return rc;