mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-31 22:25:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Compilation fixes for forthcoming GCC 3.0

Browse source
This commit is contained in:
Abramo Bagnara 2001-05-29 20:17:56 +00:00
parent f5534c46ed
commit 7f33541268
4 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
aserver/aserver.c
View file

@ -934,11 +934,10 @@ static int server(const char *sockname, int port)
static void usage(void) static void usage(void)
{ {
fprintf(stderr, "\ fprintf(stderr,
Usage: %s [OPTIONS] server "Usage: %s [OPTIONS] server\n"
"--help help\n",
--help help command);
", command);
} }
int main(int argc, char **argv) int main(int argc, char **argv)

1
src/conf.c
View file

@ -1722,6 +1722,7 @@ static int parse_id(const char **ptr)
case '\0': case '\0':
return 0; return 0;
default: default:
break;
} }
(*ptr)++; (*ptr)++;
} }

12
src/input.c
View file

@ -36,7 +36,7 @@
typedef struct _snd_input_ops { typedef struct _snd_input_ops {
int (*close)(snd_input_t *input); 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); char *(*gets)(snd_input_t *input, char *str, size_t size);
int (*getch)(snd_input_t *input); int (*getch)(snd_input_t *input);
int (*ungetch)(snd_input_t *input, int c); 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; int result;
va_list args; va_list args;
va_start(args, format); va_start(args, format);
result = input->ops->scanf(input, format, args); result = input->ops->scan(input, format, args);
va_end(args); va_end(args);
return result; return result;
} }
@ -126,7 +126,7 @@ static int snd_input_stdio_close(snd_input_t *input ATTRIBUTE_UNUSED)
return 0; 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; snd_input_stdio_t *stdio = input->private_data;
extern int vfscanf(FILE *, const char *, va_list); 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 = { static snd_input_ops_t snd_input_stdio_ops = {
close: snd_input_stdio_close, close: snd_input_stdio_close,
scanf: snd_input_stdio_scanf, scan: snd_input_stdio_scan,
gets: snd_input_stdio_gets, gets: snd_input_stdio_gets,
getch: snd_input_stdio_getc, getch: snd_input_stdio_getc,
ungetch: snd_input_stdio_ungetc, ungetch: snd_input_stdio_ungetc,
@ -226,7 +226,7 @@ static int snd_input_buffer_close(snd_input_t *input)
return 0; 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; snd_input_buffer_t *buffer = input->private_data;
extern int vsscanf(const char *, const char *, va_list); 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 = { static snd_input_ops_t snd_input_buffer_ops = {
close: snd_input_buffer_close, close: snd_input_buffer_close,
scanf: snd_input_buffer_scanf, scan: snd_input_buffer_scan,
gets: snd_input_buffer_gets, gets: snd_input_buffer_gets,
getch: snd_input_buffer_getc, getch: snd_input_buffer_getc,
ungetch: snd_input_buffer_ungetc, ungetch: snd_input_buffer_ungetc,

12
src/output.c
View file

@ -35,7 +35,7 @@
#ifndef DOC_HIDDEN #ifndef DOC_HIDDEN
typedef struct _snd_output_ops { typedef struct _snd_output_ops {
int (*close)(snd_output_t *output); 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 (*puts)(snd_output_t *output, const char *str);
int (*putch)(snd_output_t *output, int c); int (*putch)(snd_output_t *output, int c);
int (*flush)(snd_output_t *output); int (*flush)(snd_output_t *output);
@ -72,7 +72,7 @@ int snd_output_printf(snd_output_t *output, const char *format, ...)
int result; int result;
va_list args; va_list args;
va_start(args, format); va_start(args, format);
result = output->ops->printf(output, format, args); result = output->ops->print(output, format, args);
va_end(args); va_end(args);
return result; return result;
} }
@ -124,7 +124,7 @@ static int snd_output_stdio_close(snd_output_t *output ATTRIBUTE_UNUSED)
return 0; 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; snd_output_stdio_t *stdio = output->private_data;
return vfprintf(stdio->fp, format, args); 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 = { static snd_output_ops_t snd_output_stdio_ops = {
close: snd_output_stdio_close, close: snd_output_stdio_close,
printf: snd_output_stdio_printf, print: snd_output_stdio_print,
puts: snd_output_stdio_puts, puts: snd_output_stdio_puts,
putch: snd_output_stdio_putc, putch: snd_output_stdio_putc,
flush: snd_output_stdio_flush, 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; 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; snd_output_buffer_t *buffer = output->private_data;
size_t size = 256; 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 = { static snd_output_ops_t snd_output_buffer_ops = {
close: snd_output_buffer_close, close: snd_output_buffer_close,
printf: snd_output_buffer_printf, print: snd_output_buffer_print,
puts: snd_output_buffer_puts, puts: snd_output_buffer_puts,
putch: snd_output_buffer_putc, putch: snd_output_buffer_putc,
flush: snd_output_buffer_flush, flush: snd_output_buffer_flush,