diff options
| -rw-r--r-- | aserver/aserver.c | 9 | ||||
| -rw-r--r-- | src/conf.c | 1 | ||||
| -rw-r--r-- | src/input.c | 12 | ||||
| -rw-r--r-- | src/output.c | 12 |
4 files changed, 17 insertions, 17 deletions
diff --git a/aserver/aserver.c b/aserver/aserver.c index c52c1147..793f7e43 100644 --- a/aserver/aserver.c +++ b/aserver/aserver.c @@ -934,11 +934,10 @@ static int server(const char *sockname, int port) static void usage(void) { - fprintf(stderr, "\ -Usage: %s [OPTIONS] server - ---help help -", command); + fprintf(stderr, + "Usage: %s [OPTIONS] server\n" + "--help help\n", + command); } int main(int argc, char **argv) @@ -1722,6 +1722,7 @@ static int parse_id(const char **ptr) case '\0': return 0; default: + break; } (*ptr)++; } diff --git a/src/input.c b/src/input.c index 9b3f8abc..40c3c40f 100644 --- a/src/input.c +++ b/src/input.c @@ -36,7 +36,7 @@ typedef struct _snd_input_ops { int (*close)(snd_input_t *input); - int (*scanf)(snd_input_t *input, const char *format, va_list args); + int (*scan)(snd_input_t *input, const char *format, va_list args); char *(*gets)(snd_input_t *input, char *str, size_t size); int (*getch)(snd_input_t *input); int (*ungetch)(snd_input_t *input, int c); @@ -73,7 +73,7 @@ int snd_input_scanf(snd_input_t *input, const char *format, ...) int result; va_list args; va_start(args, format); - result = input->ops->scanf(input, format, args); + result = input->ops->scan(input, format, args); va_end(args); return result; } @@ -126,7 +126,7 @@ static int snd_input_stdio_close(snd_input_t *input ATTRIBUTE_UNUSED) return 0; } -static int snd_input_stdio_scanf(snd_input_t *input, const char *format, va_list args) +static int snd_input_stdio_scan(snd_input_t *input, const char *format, va_list args) { snd_input_stdio_t *stdio = input->private_data; extern int vfscanf(FILE *, const char *, va_list); @@ -153,7 +153,7 @@ static int snd_input_stdio_ungetc(snd_input_t *input, int c) static snd_input_ops_t snd_input_stdio_ops = { close: snd_input_stdio_close, - scanf: snd_input_stdio_scanf, + scan: snd_input_stdio_scan, gets: snd_input_stdio_gets, getch: snd_input_stdio_getc, ungetch: snd_input_stdio_ungetc, @@ -226,7 +226,7 @@ static int snd_input_buffer_close(snd_input_t *input) return 0; } -static int snd_input_buffer_scanf(snd_input_t *input, const char *format, va_list args) +static int snd_input_buffer_scan(snd_input_t *input, const char *format, va_list args) { snd_input_buffer_t *buffer = input->private_data; extern int vsscanf(const char *, const char *, va_list); @@ -275,7 +275,7 @@ static int snd_input_buffer_ungetc(snd_input_t *input, int c) static snd_input_ops_t snd_input_buffer_ops = { close: snd_input_buffer_close, - scanf: snd_input_buffer_scanf, + scan: snd_input_buffer_scan, gets: snd_input_buffer_gets, getch: snd_input_buffer_getc, ungetch: snd_input_buffer_ungetc, diff --git a/src/output.c b/src/output.c index e82669fa..118ae276 100644 --- a/src/output.c +++ b/src/output.c @@ -35,7 +35,7 @@ #ifndef DOC_HIDDEN typedef struct _snd_output_ops { int (*close)(snd_output_t *output); - int (*printf)(snd_output_t *output, const char *format, va_list args); + int (*print)(snd_output_t *output, const char *format, va_list args); int (*puts)(snd_output_t *output, const char *str); int (*putch)(snd_output_t *output, int c); int (*flush)(snd_output_t *output); @@ -72,7 +72,7 @@ int snd_output_printf(snd_output_t *output, const char *format, ...) int result; va_list args; va_start(args, format); - result = output->ops->printf(output, format, args); + result = output->ops->print(output, format, args); va_end(args); return result; } @@ -124,7 +124,7 @@ static int snd_output_stdio_close(snd_output_t *output ATTRIBUTE_UNUSED) return 0; } -static int snd_output_stdio_printf(snd_output_t *output, const char *format, va_list args) +static int snd_output_stdio_print(snd_output_t *output, const char *format, va_list args) { snd_output_stdio_t *stdio = output->private_data; return vfprintf(stdio->fp, format, args); @@ -150,7 +150,7 @@ static int snd_output_stdio_flush(snd_output_t *output) static snd_output_ops_t snd_output_stdio_ops = { close: snd_output_stdio_close, - printf: snd_output_stdio_printf, + print: snd_output_stdio_print, puts: snd_output_stdio_puts, putch: snd_output_stdio_putc, flush: snd_output_stdio_flush, @@ -242,7 +242,7 @@ static int snd_output_buffer_need(snd_output_t *output, size_t size) return buffer->alloc - buffer->size; } -static int snd_output_buffer_printf(snd_output_t *output, const char *format, va_list args) +static int snd_output_buffer_print(snd_output_t *output, const char *format, va_list args) { snd_output_buffer_t *buffer = output->private_data; size_t size = 256; @@ -298,7 +298,7 @@ static int snd_output_buffer_flush(snd_output_t *output ATTRIBUTE_UNUSED) static snd_output_ops_t snd_output_buffer_ops = { close: snd_output_buffer_close, - printf: snd_output_buffer_printf, + print: snd_output_buffer_print, puts: snd_output_buffer_puts, putch: snd_output_buffer_putc, flush: snd_output_buffer_flush, |