From: James Zern Date: Sat, 9 May 2015 17:33:26 +0000 (-0700) Subject: tools_common.h: fix usage_exit() prototype X-Git-Tag: v1.5.0~690^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=59e7a47c418c77089afb6dfc28b8a178d8b9f1e3;p=platform%2Fupstream%2Flibvpx.git tools_common.h: fix usage_exit() prototype + the definitions in the examples silences a missing-prototype warning Change-Id: I7c064cacd6d2073a6107de6c3e2cc46ef8a68411 --- diff --git a/examples/decode_to_md5.c b/examples/decode_to_md5.c index a3843be..1ae7a4b 100644 --- a/examples/decode_to_md5.c +++ b/examples/decode_to_md5.c @@ -71,7 +71,7 @@ static void print_md5(FILE *stream, unsigned char digest[16]) { static const char *exec_name; -void usage_exit() { +void usage_exit(void) { fprintf(stderr, "Usage: %s \n", exec_name); exit(EXIT_FAILURE); } diff --git a/examples/decode_with_drops.c b/examples/decode_with_drops.c index 36f7d80..2233e47 100644 --- a/examples/decode_with_drops.c +++ b/examples/decode_with_drops.c @@ -65,7 +65,7 @@ static const char *exec_name; -void usage_exit() { +void usage_exit(void) { fprintf(stderr, "Usage: %s \n", exec_name); exit(EXIT_FAILURE); } diff --git a/examples/postproc.c b/examples/postproc.c index e34426a..a8ac208 100644 --- a/examples/postproc.c +++ b/examples/postproc.c @@ -52,7 +52,7 @@ static const char *exec_name; -void usage_exit() { +void usage_exit(void) { fprintf(stderr, "Usage: %s \n", exec_name); exit(EXIT_FAILURE); } diff --git a/examples/resize_util.c b/examples/resize_util.c index f8c3525..e6fdd5b 100644 --- a/examples/resize_util.c +++ b/examples/resize_util.c @@ -15,6 +15,7 @@ #include #include +#include "../tools_common.h" #include "../vp9/encoder/vp9_resize.h" static const char *exec_name = NULL; @@ -26,7 +27,7 @@ static void usage() { printf(" []\n"); } -void usage_exit() { +void usage_exit(void) { usage(); exit(EXIT_FAILURE); } diff --git a/examples/set_maps.c b/examples/set_maps.c index 5555baa..1dc3ac0 100644 --- a/examples/set_maps.c +++ b/examples/set_maps.c @@ -55,7 +55,7 @@ static const char *exec_name; -void usage_exit() { +void usage_exit(void) { fprintf(stderr, "Usage: %s \n", exec_name); exit(EXIT_FAILURE); diff --git a/examples/simple_decoder.c b/examples/simple_decoder.c index 08a2166..8ccc810 100644 --- a/examples/simple_decoder.c +++ b/examples/simple_decoder.c @@ -88,7 +88,7 @@ static const char *exec_name; -void usage_exit() { +void usage_exit(void) { fprintf(stderr, "Usage: %s \n", exec_name); exit(EXIT_FAILURE); } diff --git a/examples/simple_encoder.c b/examples/simple_encoder.c index e805c25..a307729 100644 --- a/examples/simple_encoder.c +++ b/examples/simple_encoder.c @@ -106,7 +106,7 @@ static const char *exec_name; -void usage_exit() { +void usage_exit(void) { fprintf(stderr, "Usage: %s " " []\nSee comments in " diff --git a/examples/twopass_encoder.c b/examples/twopass_encoder.c index 0ec83dd..aecc11d 100644 --- a/examples/twopass_encoder.c +++ b/examples/twopass_encoder.c @@ -58,7 +58,7 @@ static const char *exec_name; -void usage_exit() { +void usage_exit(void) { fprintf(stderr, "Usage: %s \n", exec_name); exit(EXIT_FAILURE); diff --git a/examples/vp8_multi_resolution_encoder.c b/examples/vp8_multi_resolution_encoder.c index e623567..1052fc1 100644 --- a/examples/vp8_multi_resolution_encoder.c +++ b/examples/vp8_multi_resolution_encoder.c @@ -41,11 +41,11 @@ #include "vpx/vpx_encoder.h" #include "vpx/vp8cx.h" #include "vpx_ports/mem_ops.h" -#include "./tools_common.h" +#include "../tools_common.h" #define interface (vpx_codec_vp8_cx()) #define fourcc 0x30385056 -void usage_exit() { +void usage_exit(void) { exit(EXIT_FAILURE); } diff --git a/examples/vp8cx_set_ref.c b/examples/vp8cx_set_ref.c index a298282..8b4cc30 100644 --- a/examples/vp8cx_set_ref.c +++ b/examples/vp8cx_set_ref.c @@ -58,7 +58,7 @@ static const char *exec_name; -void usage_exit() { +void usage_exit(void) { fprintf(stderr, "Usage: %s \n", exec_name); exit(EXIT_FAILURE); diff --git a/examples/vp9_lossless_encoder.c b/examples/vp9_lossless_encoder.c index 5427577..8272516 100644 --- a/examples/vp9_lossless_encoder.c +++ b/examples/vp9_lossless_encoder.c @@ -20,7 +20,7 @@ static const char *exec_name; -void usage_exit() { +void usage_exit(void) { fprintf(stderr, "vp9_lossless_encoder: Example demonstrating VP9 lossless " "encoding feature. Supports raw input only.\n"); fprintf(stderr, "Usage: %s \n", exec_name); diff --git a/examples/vp9_spatial_svc_encoder.c b/examples/vp9_spatial_svc_encoder.c index f4deb69..a3fd65f 100644 --- a/examples/vp9_spatial_svc_encoder.c +++ b/examples/vp9_spatial_svc_encoder.c @@ -116,7 +116,7 @@ typedef struct { static const char *exec_name; -void usage_exit() { +void usage_exit(void) { fprintf(stderr, "Usage: %s input_filename output_filename\n", exec_name); fprintf(stderr, "Options:\n"); diff --git a/examples/vpx_temporal_svc_encoder.c b/examples/vpx_temporal_svc_encoder.c index 3498759..964954e 100644 --- a/examples/vpx_temporal_svc_encoder.c +++ b/examples/vpx_temporal_svc_encoder.c @@ -28,7 +28,7 @@ static const char *exec_name; -void usage_exit() { +void usage_exit(void) { exit(EXIT_FAILURE); } diff --git a/tools_common.h b/tools_common.h index de6c38f..b92980a 100644 --- a/tools_common.h +++ b/tools_common.h @@ -119,7 +119,7 @@ void warn(const char *fmt, ...); void die_codec(vpx_codec_ctx_t *ctx, const char *s) VPX_NO_RETURN; /* The tool including this file must define usage_exit() */ -void usage_exit() VPX_NO_RETURN; +void usage_exit(void) VPX_NO_RETURN; #undef VPX_NO_RETURN diff --git a/vpxdec.c b/vpxdec.c index 8c938df..c7736ab 100644 --- a/vpxdec.c +++ b/vpxdec.c @@ -169,7 +169,7 @@ static INLINE int libyuv_scale(vpx_image_t *src, vpx_image_t *dst, } #endif -void usage_exit() { +void usage_exit(void) { int i; fprintf(stderr, "Usage: %s filename\n\n" diff --git a/vpxenc.c b/vpxenc.c index 851d432..850e183 100644 --- a/vpxenc.c +++ b/vpxenc.c @@ -467,7 +467,7 @@ static const int vp9_arg_ctrl_map[] = { static const arg_def_t *no_args[] = { NULL }; -void usage_exit() { +void usage_exit(void) { int i; fprintf(stderr, "Usage: %s -o dst_filename src_filename \n",