upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 00:29:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make ConfigArgs.lineno int like elsewhere instead of unsigned long

Browse source
This commit is contained in:
Hallvard Furuseth 2005-07-18 05:48:21 +00:00
parent 8adef9eec8
commit ae3ef7b3cd
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
servers/slapd/bconfig.c
View file

@ -2279,7 +2279,7 @@ config_updateref(ConfigArgs *c) {
static int
config_include(ConfigArgs *c) {
unsigned long savelineno = c->lineno;
int savelineno = c->lineno;
int rc;
ConfigFile *cf;
ConfigFile *cfsave = cfn;

6
servers/slapd/config.c
View file

@ -609,7 +609,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
continue;
}
snprintf( c->log, sizeof( c->log ), "%s: line %lu",
snprintf( c->log, sizeof( c->log ), "%s: line %d",
c->fname, c->lineno );
c->argc = 0;
@ -1117,7 +1117,7 @@ fp_parse_line(ConfigArgs *c)
if(token) for(i = 0; hide[i]; i++) if(!strcasecmp(token, hide[i])) break;
if(quote_ptr) *quote_ptr = ' ';
Debug(LDAP_DEBUG_CONFIG, "line %lu (%s%s)\n", c->lineno,
Debug(LDAP_DEBUG_CONFIG, "line %d (%s%s)\n", c->lineno,
hide[i] ? hide[i] : c->line, hide[i] ? " ***" : "");
if(quote_ptr) *quote_ptr = '\0';
@ -1126,7 +1126,7 @@ fp_parse_line(ConfigArgs *c)
char **tmp;
tmp = ch_realloc(c->argv, (c->argv_size + ARGS_STEP) * sizeof(*c->argv));
if(!tmp) {
Debug(LDAP_DEBUG_ANY, "line %lu: out of memory\n", c->lineno, 0, 0);
Debug(LDAP_DEBUG_ANY, "line %d: out of memory\n", c->lineno, 0, 0);
return -1;
}
c->argv = tmp;

2
servers/slapd/config.h
View file

@ -109,7 +109,7 @@ typedef struct config_args_s {
char *line;
char *tline;
const char *fname;
unsigned long lineno;
int lineno;
char log[MAXPATHLEN + STRLENOF(": line 18446744073709551615") + 1];
char msg[SLAP_TEXT_BUFLEN];
int depth;