mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename label "leave" to "done".

Browse Source 
Tru64 5.1 alpha's <pthread.h> turns "leave" into an exception handling keyword.
This commit is contained in:
Hallvard Furuseth 2005-08-26 22:23:27 +00:00
parent a1a9507295
commit f17ffeb925
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
servers/slapd/back-ldif/ldif.c
View File

@ -346,7 +346,7 @@ static int r_enum_tree(enumCookie *ck, struct berval *path,
}
fd = 1;
if ( rc )
goto leave;
goto done;
} else {
/* Queueing up for tool mode */
if(ck->entries == NULL) {
@ -382,7 +382,7 @@ static int r_enum_tree(enumCookie *ck, struct berval *path,
"=> ldif_enum_tree: failed to opendir %s (%d)\n",
path->bv_val, errno, 0 );
}
goto leave;
goto done;
}
while(1) {
@ -453,7 +453,7 @@ static int r_enum_tree(enumCookie *ck, struct berval *path,
free(ptr);
}
}
leave:
done:
if ( fd ) entry_free( e );
return rc;
}

12
servers/slapd/bconfig.c
View File

@ -3216,7 +3216,7 @@ config_add_internal( CfBackInfo *cfb, Entry *e, ConfigArgs *ca, SlapReply *rs, i
}
if ( rc != LDAP_SUCCESS )
goto leave;
goto done;
/* Parse all the values and check for simple syntax errors before
* performing any set actions.
@ -3236,7 +3236,7 @@ config_add_internal( CfBackInfo *cfb, Entry *e, ConfigArgs *ca, SlapReply *rs, i
*/
rc = check_name_index( last, colst[0]->co_type, e, rs, renum );
if ( rc )
goto leave;
goto done;
init_config_argv( ca );
@ -3248,7 +3248,7 @@ config_add_internal( CfBackInfo *cfb, Entry *e, ConfigArgs *ca, SlapReply *rs, i
ct = config_find_table( colst, nocs, a->a_desc );
if ( !ct ) continue; /* user data? */
rc = check_vals( ct, ca, a, 1 );
if ( rc ) goto leave;
if ( rc ) goto done;
}
/* Basic syntax checks are OK. Do the actual settings. */
@ -3266,7 +3266,7 @@ config_add_internal( CfBackInfo *cfb, Entry *e, ConfigArgs *ca, SlapReply *rs, i
rc = config_parse_add( ct, ca );
if ( rc ) {
rc = LDAP_OTHER;
goto leave;
goto done;
}
}
}
@ -3289,7 +3289,7 @@ ok:
Debug(LDAP_DEBUG_ANY, "%s: %s (%s)!\n",
ca->log, ca->msg, ca->argv[1] );
rc = LDAP_OTHER;
goto leave;
goto done;
}
}
@ -3313,7 +3313,7 @@ ok:
last->ce_kids = ce;
}
leave:
done:
if ( rc ) {
if ( (colst[0]->co_type == Cft_Database) && ca->be ) {
if ( ca->be != frontendDB )

18
servers/slapd/config.c
View File

@ -638,7 +638,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
ch_free( c->tline );
if ( fp_parse_line( c ) ) {
rc = 1;
goto leave;
goto done;
}
if ( c->argc < 1 ) {
@ -647,7 +647,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
c->log, 0, 0);
#ifdef SLAPD_CONF_UNKNOWN_BAILOUT
rc = 1;
goto leave;
goto done;
#else /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
continue;
#endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
@ -665,11 +665,11 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
Debug(LDAP_DEBUG_CONFIG, "%s: unknown user type <%s>\n",
c->log, c->argv[0], 0);
rc = 1;
goto leave;
goto done;
} else if ( rc == ARG_BAD_CONF ) {
rc = 1;
goto leave;
goto done;
}
} else if ( c->bi && !c->be ) {
@ -696,7 +696,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
#endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
default:
rc = 1;
goto leave;
goto done;
}
}
@ -724,7 +724,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
#endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
default:
rc = 1;
goto leave;
goto done;
}
}
@ -742,7 +742,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
#endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
default:
rc = 1;
goto leave;
goto done;
}
}
@ -753,7 +753,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
c->log, *c->argv, 0);
#ifdef SLAPD_CONF_UNKNOWN_BAILOUT
rc = 1;
goto leave;
goto done;
#else /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
continue;
#endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
@ -762,7 +762,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
rc = 0;
leave:
done:
ch_free(c->tline);
fclose(fp);
ch_free(c->argv);