Again, not a complete sweep.
static void cf_stats(char attribute((unused)) **argv) {
char **vec;
int nvec;
static void cf_stats(char attribute((unused)) **argv) {
char **vec;
int nvec;
if(disorder_stats(getclient(), &vec, &nvec)) exit(EXIT_FAILURE);
if(disorder_stats(getclient(), &vec, &nvec)) exit(EXIT_FAILURE);
- for(int n = 0; n < nvec; ++n)
+ for(n = 0; n < nvec; ++n)
xprintf("%s\n", nullcheck(utf82mb(vec[n])));
free_strings(nvec, vec);
}
xprintf("%s\n", nullcheck(utf82mb(vec[n])));
free_strings(nvec, vec);
}
static void cf_playlists(char attribute((unused)) **argv) {
char **vec;
int nvec;
static void cf_playlists(char attribute((unused)) **argv) {
char **vec;
int nvec;
if(disorder_playlists(getclient(), &vec, &nvec))
exit(EXIT_FAILURE);
if(disorder_playlists(getclient(), &vec, &nvec))
exit(EXIT_FAILURE);
- for(int n = 0; n < nvec; ++n)
+ for(n = 0; n < nvec; ++n)
xprintf("%s\n", nullcheck(utf82mb(vec[n])));
free_strings(nvec, vec);
}
xprintf("%s\n", nullcheck(utf82mb(vec[n])));
free_strings(nvec, vec);
}
static void cf_playlist_get(char **argv) {
char **vec;
int nvec;
static void cf_playlist_get(char **argv) {
char **vec;
int nvec;
if(disorder_playlist_get(getclient(), argv[0], &vec, &nvec))
exit(EXIT_FAILURE);
if(disorder_playlist_get(getclient(), argv[0], &vec, &nvec))
exit(EXIT_FAILURE);
- for(int n = 0; n < nvec; ++n)
+ for(n = 0; n < nvec; ++n)
xprintf("%s\n", nullcheck(utf82mb(vec[n])));
free_strings(nvec, vec);
}
xprintf("%s\n", nullcheck(utf82mb(vec[n])));
free_strings(nvec, vec);
}
int nvec,
char **vec) {
const char *port;
int nvec,
char **vec) {
const char *port;
na->af = AF_UNSPEC;
if(nvec > 0 && vec[0][0] == '-') {
na->af = AF_UNSPEC;
if(nvec > 0 && vec[0][0] == '-') {
}
if(port[strspn(port, "0123456789")])
return -1;
}
if(port[strspn(port, "0123456789")])
return -1;
- long p;
- int e = xstrtol(&p, port, NULL, 10);
+ e = xstrtol(&p, port, NULL, 10);
} else if(arg == disorder__list) {
char **list = va_arg(ap, char **);
int nlist = va_arg(ap, int);
} else if(arg == disorder__list) {
char **list = va_arg(ap, char **);
int nlist = va_arg(ap, int);
if(nlist < 0) {
for(nlist = 0; list[nlist]; ++nlist)
;
}
if(nlist < 0) {
for(nlist = 0; list[nlist]; ++nlist)
;
}
- for(int n = 0; n < nlist; ++n) {
+ for(n = 0; n < nlist; ++n) {
dynstr_append(&d, ' ');
dynstr_append_string(&d, quoteutf8(arg));
}
dynstr_append(&d, ' ');
dynstr_append_string(&d, quoteutf8(arg));
}
goto write_error;
xfree(d.vec);
if(has_body) {
goto write_error;
xfree(d.vec);
if(has_body) {
if(nbody < 0)
for(nbody = 0; body[nbody]; ++nbody)
;
if(nbody < 0)
for(nbody = 0; body[nbody]; ++nbody)
;
- for(int n = 0; n < nbody; ++n) {
+ for(n = 0; n < nbody; ++n) {
if(body[n][0] == '.')
if(fputc('.', c->fpout) < 0)
goto write_error;
if(body[n][0] == '.')
if(fputc('.', c->fpout) < 0)
goto write_error;
va_list ap;
struct vector v[1];
char *s;
va_list ap;
struct vector v[1];
char *s;
vector_init(v);
vector_append(v, (char *)which);
vector_init(v);
vector_append(v, (char *)which);
vector_append(v, s);
va_end(ap);
vector_terminate(v);
vector_append(v, s);
va_end(ap);
vector_terminate(v);
- int rc = config_set(cs, v->nvec, v->vec);
+ rc = config_set(cs, v->nvec, v->vec);
xfree(v->vec);
return rc;
}
xfree(v->vec);
return rc;
}
*/
int config_verify(void) {
int fails = 0;
*/
int config_verify(void) {
int fails = 0;
- for(size_t n = 1; n < sizeof conf / sizeof *conf; ++n)
+ size_t n;
+ for(n = 1; n < sizeof conf / sizeof *conf; ++n)
if(strcmp(conf[n-1].name, conf[n].name) >= 0) {
fprintf(stderr, "%s >= %s\n", conf[n-1].name, conf[n].name);
++fails;
if(strcmp(conf[n-1].name, conf[n].name) >= 0) {
fprintf(stderr, "%s >= %s\n", conf[n-1].name, conf[n].name);
++fails;
void (*error_handler)(const char *, void *),
void *u) {
char **vec;
void (*error_handler)(const char *, void *),
void *u) {
char **vec;
q->pid = -1; /* =none */
if(!(vec = split(s, &nvec, SPLIT_QUOTES, error_handler, u)))
return -1;
q->pid = -1; /* =none */
if(!(vec = split(s, &nvec, SPLIT_QUOTES, error_handler, u)))
return -1;
- int rc = queue_unmarshall_vec(q, nvec, vec, error_handler, u);
+ rc = queue_unmarshall_vec(q, nvec, vec, error_handler, u);
free_strings(nvec, vec);
return rc;
}
free_strings(nvec, vec);
return rc;
}
}
void queue_free(struct queue_entry *q, int rest) {
}
void queue_free(struct queue_entry *q, int rest) {
if(!q)
return;
if(rest)
queue_free(q->next, rest);
if(!q)
return;
if(rest)
queue_free(q->next, rest);
- for(unsigned n = 0; n < NFIELDS; ++n)
+ for(n = 0; n < NFIELDS; ++n)
fields[n].free(q, fields[n].offset);
xfree(q);
}
fields[n].free(q, fields[n].offset);
xfree(q);
}
/*
* This file is part of DisOrder.
/*
* This file is part of DisOrder.
- * Copyright (C) 2004, 2007-2009 Richard Kettlewell
+ * Copyright (C) 2004, 2007-2009, 2013 Richard Kettlewell
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
/** @brief Free a string list */
void free_strings(int nvec, char **vec) {
/** @brief Free a string list */
void free_strings(int nvec, char **vec) {
- for(int n = 0; n < nvec; ++n)
+ int n;
+ for(n = 0; n < nvec; ++n)
xfree(vec[n]);
xfree(vec);
}
xfree(vec[n]);
xfree(vec);
}