Attachment 156632 Details for Bug 243488 – cvs diffs

[patch] cvs diffs

ldapserver.diffs (text/plain), 12.54 KB, created by Noriko Hosoi on 2007-06-09 00:19:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-06-09 00:19:28 UTC

Size: 12.54 KB

patch

obsolete

>Index: ldap/admin/lib/dsalib_confs.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/lib/dsalib_confs.c,v
>retrieving revision 1.7
>diff -t -w -U4 -r1.7 dsalib_confs.c
>--- ldap/admin/lib/dsalib_confs.c	10 Nov 2006 23:44:32 -0000	1.7
>+++ ldap/admin/lib/dsalib_confs.c	9 Jun 2007 00:12:14 -0000
>@@ -77,24 +77,18 @@
>             while ((line = ldif_getline(&entry))) {
>                 char *type, *value;
>                 int vlen = 0;
>                 int rc;
>-                char *errmsg = NULL;
> 
>                 if ( *line == '\n' || *line == '\0' ) {
>                     break;
>                 }
> 
>                 /* this call modifies line */
>-                rc = ldif_parse_line(line, &type, &value, &vlen, &errmsg);
>+                rc = ldif_parse_line(line, &type, &value, &vlen);
>                 if (rc != 0)
>                 {
>-                    if ( errmsg != NULL ) {
>-                        ds_send_error(errmsg, 0);
>-                        PR_smprintf_free(errmsg);
>-                    } else {
>                         ds_send_error("Unknown error processing config file", 0);
>-                    }
>                     free(begin);
>                     return NULL;
>                 }
>                 listsize++;
>@@ -159,9 +153,9 @@
>                     /*
>                      * Use ldif_parse_line() so continuation markers are
>                      * handled correctly, etc.
>                      */
>-                    char        *errmsg, *type = NULL, *value = NULL, *tmpvalue = NULL;
>+                    char        *type = NULL, *value = NULL, *tmpvalue = NULL;
>                     int         ldif_rc, tmpvlen = 0;
>                     char        *tmpline = strdup(line);
> 
>                     if ( NULL == tmpline ) {
>@@ -170,21 +164,17 @@
>                                 1 /* print errno */ );
>                         return(NULL);
>                     }
> 
>-                    ldif_rc = ldif_parse_line( tmpline, &type, &tmpvalue,
>-                                                &tmpvlen, &errmsg );
>+                    ldif_rc = ldif_parse_line( tmpline, &type, &tmpvalue, &tmpvlen );
>                     if (ldif_rc < 0) {
>-                        ds_send_error(errmsg, 0 /* do not print errno */);
>+                        ds_send_error("Unknown error processing config file", 0);
>                     } else if (ldif_rc == 0) {  /* value returned in place */
>                         value = strdup(tmpvalue);
>                     } else {                    /* malloc'd value */
>                         value = tmpvalue;
>                     }
>                     free(tmpline);
>-                        if (errmsg) {
>-                                PR_smprintf_free(errmsg);
>-                        }
>                     return value;
>                 }
>         }
>         line_num++;
>
>Index: ldap/servers/plugins/replication/cl5_api.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5_api.c,v
>retrieving revision 1.14
>diff -t -w -U4 -r1.14 cl5_api.c
>--- ldap/servers/plugins/replication/cl5_api.c	15 Mar 2007 21:40:34 -0000	1.14
>+++ ldap/servers/plugins/replication/cl5_api.c	9 Jun 2007 00:12:15 -0000
>@@ -4987,23 +4987,17 @@
>         
>         next = ldifEntry;
>         while ((line = ldif_getline(&next)) != NULL) 
>         {
>-                char *errmsg = NULL;
>-
>                 if ( *line == '\n' || *line == '\0' ) 
>                 {
>                         break;
>                 }
> 
>                 /* this call modifies ldifEntry */
>-                rc = ldif_parse_line(line, &type, &value, &vlen, &errmsg);
>+                rc = ldif_parse_line(line, &type, &value, &vlen);
>                 if (rc != 0)
>                 {
>-                        if ( errmsg != NULL ) {
>-                                slapi_log_error(SLAPI_LOG_PARSE, repl_plugin_name_cl, "%s", errmsg); 
>-                                PR_smprintf_free(errmsg );
>-                        }
>                         slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, 
>                                                         "_cl5LDIF2Operation: warning - failed to parse ldif line\n");
>                         continue;
>                 }
>Index: ldap/servers/plugins/replication/replutil.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/replutil.c,v
>retrieving revision 1.9
>diff -t -w -U4 -r1.9 replutil.c
>--- ldap/servers/plugins/replication/replutil.c	10 Nov 2006 23:45:17 -0000	1.9
>+++ ldap/servers/plugins/replication/replutil.c	9 Jun 2007 00:12:16 -0000
>@@ -427,10 +427,8 @@
>         {
>                 slapi_mod_init (&mod, 0);               
>                 while (line)
>                 {               
>-                        char * errmsg = NULL;
>-
>                         if (strcasecmp (line, "-") == 0)
>                         {
>                                 if (slapi_mod_isvalid (&mod))
>                                 {
>@@ -445,16 +443,12 @@
>                                 line = ldif_getline (&next);
>                                 break;
>                         }
> 
>-                        rc = ldif_parse_line(line, &type, &value, &vlen, &errmsg);
>+                        rc = ldif_parse_line(line, &type, &value, &vlen);
>                         if (rc != 0)
>                         {
>                                 /* ONREPL - log warning */
>-                                if ( errmsg != NULL ) {
>-                                        slapi_log_error( SLAPI_LOG_PARSE, repl_plugin_name, "%s", errmsg ); 
>-                                        PR_smprintf_free(errmsg );
>-                                }
>                                 slapi_log_error( SLAPI_LOG_REPL, repl_plugin_name, 
>                                                  "Failed to parse the ldif line.\n");
>                                 continue;
>                         }
>Index: ldap/servers/slapd/entry.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/entry.c,v
>retrieving revision 1.12
>diff -t -w -U4 -r1.12 entry.c
>--- ldap/servers/slapd/entry.c	10 Nov 2006 23:45:40 -0000	1.12
>+++ ldap/servers/slapd/entry.c	9 Jun 2007 00:12:16 -0000
>@@ -202,29 +202,19 @@
>                 int attr_state= ATTRIBUTE_NOTFOUND;
>                 int maxvals;
>                 int del_maxvals;
>                 char *type;
>-                char *errmsg = NULL;
> 
>                 if ( *s == '\n' || *s == '\0' ) {
>                         break;
>                 }
> 
>-                if ( (retmalloc = ldif_parse_line( s, &type, &valuecharptr, &valuelen, &errmsg )) < 0 ) {
>-                        if ( errmsg != NULL ) {
>-                                 LDAPDebug( LDAP_DEBUG_PARSE, "%s", errmsg, 0, 0 );
>-                                 /* the memory below was not allocated by the slapi_ch_ functions */
>-                                 PR_smprintf_free(errmsg );
>-                        }
>+                if ( (retmalloc = ldif_parse_line( s, &type, &valuecharptr, &valuelen )) < 0 ) {
>                         LDAPDebug( LDAP_DEBUG_TRACE,
>                             "<= str2entry_fast NULL (parse_line)\n", 0, 0, 0 );
>                         continue;
>                 }
> 
>-                /* We don't use errmsg anywhere later. free it to avoid leaking... */
>-                /* the memory below was not allocated by the slapi_ch_ functions */
>-                slapi_ch_free( (void**)&errmsg );
>-
>                 /*
>                  * Extract the attribute and value CSNs from the attribute type.
>                  */             
>                 attributecsntype= CSN_TYPE_NONE;
>@@ -580,9 +570,8 @@
>     str2entry_attr *sa;
>     int i, j;
>     char *next=NULL;
>     char *valuecharptr=NULL;
>-    char *errmsg = NULL;
>     int retmalloc = 0;
>     int rc;
>         int fast_dup_check = 0;
>         entry_attrs *ea = NULL;
>@@ -616,23 +605,14 @@
>                 if ( *s == '\n' || *s == '\0' ) {
>                     break;
>                 }
> 
>-                if ( (retmalloc = ldif_parse_line( s, &type, &valuecharptr, &valuelen, &errmsg )) < 0 ) {
>-                    if ( errmsg != NULL ) {
>-                             LDAPDebug( LDAP_DEBUG_PARSE, "%s", errmsg, 0, 0 );
>-                             /* the memory below was not allocated by the slapi_ch_ functions */
>-                             PR_smprintf_free(errmsg );
>-                    }
>+                if ( (retmalloc = ldif_parse_line( s, &type, &valuecharptr, &valuelen )) < 0 ) {
>                     LDAPDebug( LDAP_DEBUG_TRACE,
>                             "<= slapi_str2entry NULL (parse_line)\n", 0, 0, 0 );
>                     continue;
>                 }
> 
>-                /* We don't use errmsg anywhere later. free it to avoid leaking... */
>-                /* the memory below was not allocated by the slapi_ch_ functions */
>-                slapi_ch_free( (void**)&errmsg );
>-
>                 /*
>                  * Extract the attribute and value CSNs from the attribute type.
>                  */             
>                 attributecsntype= CSN_TYPE_UNKNOWN;
>Index: ldap/servers/slapd/fedse.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/fedse.c,v
>retrieving revision 1.9
>diff -t -w -U4 -r1.9 fedse.c
>--- ldap/servers/slapd/fedse.c	10 Nov 2006 23:45:40 -0000	1.9
>+++ ldap/servers/slapd/fedse.c	9 Jun 2007 00:12:17 -0000
>@@ -1734,9 +1734,8 @@
>     if(fstr!=NULL && strcasecmp(fstr,eggfilter)==0)
>     {
>                 static int twiddle= -1;
>                 char *type, *value, *copy;
>-                char *errmsg = NULL;
>                 int vlen;
>                 struct berval bv;
>                 struct berval *bvals[2];
>                 if (twiddle < 0) {
>@@ -1744,14 +1743,9 @@
>                 }
>                 bvals[0] = &bv;
>                 bvals[1] = NULL;
>                 copy= slapi_ch_strdup(easter_egg_photos[twiddle%NUM_EASTER_EGG_PHOTOS]);
>-                if ( (retmalloc = ldif_parse_line(copy, &type, &value, &vlen, &errmsg)) < 0 ) {
>-                    if ( errmsg != NULL ) {
>-                             slapi_log_error( SLAPI_LOG_PARSE, "dse", "%s", errmsg );
>-                             /* the memory below was not allocated by the slapi_ch_ functions */
>-                             PR_smprintf_free(errmsg );
>-                    }
>+                if ( (retmalloc = ldif_parse_line(copy, &type, &value, &vlen)) < 0 ) {
>                     return SLAPI_DSE_CALLBACK_ERROR;
>                 }
>                 bv.bv_val = value;
>                 bv.bv_len = vlen;
>@@ -1759,9 +1753,8 @@
>         slapi_entry_attr_merge(entryBefore, "jpegphoto", bvals);
>                 slapi_ch_free((void**)&copy);
>                 twiddle++;
>                 /* the memory below was not allocated by the slapi_ch_ functions */
>-                slapi_ch_free( (void**)&errmsg );
>                 if (retmalloc) slapi_ch_free( (void**)&value );
>         return SLAPI_DSE_CALLBACK_OK;
>     }
>     return SLAPI_DSE_CALLBACK_ERROR;
>Index: ldap/servers/slapd/back-ldbm/import-threads.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import-threads.c,v
>retrieving revision 1.12
>diff -t -w -U4 -r1.12 import-threads.c
>--- ldap/servers/slapd/back-ldbm/import-threads.c	10 Nov 2006 23:45:39 -0000	1.12
>+++ ldap/servers/slapd/back-ldbm/import-threads.c	9 Jun 2007 00:12:17 -0000
>@@ -282,23 +282,18 @@
> 
>     offset = s - str;
>     mystr = ms = slapi_ch_strdup(str);
>     while ( (s = ldif_getline( &ms )) != NULL ) {
>-        char *errmsg = NULL;
>-        if ( (retmalloc = ldif_parse_line( s, &type, &valuecharptr, &valuelen, &errmsg )) >= 0 ) {
>+        if ( (retmalloc = ldif_parse_line( s, &type, &valuecharptr, &valuelen )) >= 0 ) {
>             if (!strcasecmp(type, "version")) {
>                 my_version = atoi(valuecharptr);
>                 *(str + offset) = '#';
>                 /* the memory below was not allocated by the slapi_ch_ functions */
>-                if (errmsg) PR_smprintf_free(errmsg);
>                 if (retmalloc) slapi_ch_free((void **) &valuecharptr);
>                 break;
>             } 
>-        } else if ( errmsg != NULL ) {
>-            LDAPDebug( LDAP_DEBUG_PARSE, "%s", errmsg, 0, 0 );
>         }
>         /* the memory below was not allocated by the slapi_ch_ functions */
>-        if (errmsg) slapi_ch_free((void **) &errmsg);
>         if (retmalloc) slapi_ch_free((void **) &valuecharptr);
>     }
> 
>     slapi_ch_free((void **)&mystr);

Actions: View | Diff

Attachments on bug 243488: 156632 | 156742