diff options
author | Noriko Hosoi <nhosoi@redhat.com> | 2007-06-11 17:22:38 +0000 |
---|---|---|
committer | Noriko Hosoi <nhosoi@redhat.com> | 2007-06-11 17:22:38 +0000 |
commit | 3c6758091e1d5bd2eaec52981410d7a01cb2bfa5 (patch) | |
tree | 32d0bc7b007fb8033cb6c6e721f851ebb545a068 /ldap/servers/slapd/back-ldbm/import-threads.c | |
parent | 941ed15d730bb365a5b056b37c81eccd10ca3c61 (diff) | |
download | ds-3c6758091e1d5bd2eaec52981410d7a01cb2bfa5.tar.gz ds-3c6758091e1d5bd2eaec52981410d7a01cb2bfa5.tar.xz ds-3c6758091e1d5bd2eaec52981410d7a01cb2bfa5.zip |
Resolves: #243488
Summary: Use mozldap6 ldif_parse_line API
Changes:
1) Removed ldif.h from the DS tree.
2) Eliminated the 5-th arg of ldif_parse_line (errmsg) and the errmsg related
code.
Diffstat (limited to 'ldap/servers/slapd/back-ldbm/import-threads.c')
-rw-r--r-- | ldap/servers/slapd/back-ldbm/import-threads.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ldap/servers/slapd/back-ldbm/import-threads.c b/ldap/servers/slapd/back-ldbm/import-threads.c index 6d51a3b0..aab8b9a3 100644 --- a/ldap/servers/slapd/back-ldbm/import-threads.c +++ b/ldap/servers/slapd/back-ldbm/import-threads.c @@ -283,21 +283,16 @@ import_get_version(char *str) 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); } |