autoconf cleanup, fix -Wextra warnings

.travis.yml

@@ -8,6 +8,6 @@ before_install:
   - sudo apt-get install libsndfile1-dev
 
 script:
-  - ./bootstrap
+  - autoreconf -i
   - ./configure
-  - make DISTCHECK_CONFIGURE_FLAGS='--enable-examples' distcheck
+  - make distcheck

Makefile.am

@@ -3,8 +3,9 @@ if BUILD_EXAMPLES
 endif
 
 SUBDIRS = src $(examples_dir) tests
+AM_DISTCHECK_CONFIGURE_FLAGS = --enable-examples
 ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = bootstrap LICENSE PATENTS README.md tools
+EXTRA_DIST = LICENSE PATENTS README.md
 
 # install pkgconfig file
 pkgconfigdir = $(libdir)/pkgconfig

README.md

@@ -7,21 +7,29 @@ from the rest of the WebRTC code. There are currently no changes in
 functionality.
 
 ## Building and Installing ##
-libfvad uses autoconf/automake. After cloning the git repository, the
-*configure* script can be generated using `./bootstrap`, afterwards the library
-can be build and installed with the usual `./configure`, `make` and
-`make install`.
+libfvad uses autoconf/automake and can be build and installed with the usual:
+```
+./configure
+make
+sudo make install
+```
+
+When building from the cloned git repository (instead of a downloaded release),
+run `autoreconf -i` to create the missing *configure* script.
 
 An optional example can be enabled enabled by `./configure --enable-examples`.
 This requires libsndfile (http://www.mega-nerd.com/libsndfile/, e.g.
 `apt install libsndfile1-dev`).
 
-Tests can be run with `make check`.
-
 ## Usage ##
-The API is documented in the `include/fvad.h` header file.
+The API is documented in the `include/fvad.h` header file. See also
+`examples/fvadwav.h`.
+
+## Development Notes ##
+Recommended CFLAGS to turn on warnings: `-std=c11 -Wall -Wextra -Wpedantic`.
+Tests can be run with `make check`.
 
-## Origin ##
+### Origin ###
 This library largely consists of parts of the WebRTC Native Code package, the
 repository of which can be found at
 https://chromium.googlesource.com/external/webrtc:

configure.ac

@@ -8,8 +8,6 @@ AM_INIT_AUTOMAKE([
 ])
 
 AC_PROG_CC
-AX_APPEND_COMPILE_FLAGS([-std=c11 -Wall -Wpedantic])
-AC_PROG_CC_STDC
 
 LT_INIT([disable-static pic-only])
 

examples/fvadwav.c

@@ -35,7 +35,7 @@ static bool process_sf(SNDFILE *infile, Fvad *vad,
         goto end;
     }
 
-    while (sf_read_double(infile, buf0, framelen) == framelen) {
+    while (sf_read_double(infile, buf0, framelen) == (sf_count_t)framelen) {
 
         // Convert the read samples to int16
         for (size_t i = 0; i < framelen; i++)

src/fvad.c

@@ -26,7 +26,7 @@ static int (*const process_funcs[])(VadInstT*, const int16_t*, size_t) = {
 };
 
 // valid frame lengths in ms
-static const int valid_frame_times[] = { 10, 20, 30 };
+static const size_t valid_frame_times[] = { 10, 20, 30 };
 
 
 struct Fvad {
@@ -72,7 +72,7 @@ int fvad_set_mode(Fvad* inst, int mode)
 int fvad_set_sample_rate(Fvad* inst, int sample_rate)
 {
     assert(inst);
-    for (int i = 0; i < arraysize(valid_rates); i++) {
+    for (size_t i = 0; i < arraysize(valid_rates); i++) {
         if (valid_rates[i] * 1000 == sample_rate) {
             inst->rate_idx = i;
             return 0;
@@ -85,7 +85,7 @@ int fvad_set_sample_rate(Fvad* inst, int sample_rate)
 static bool valid_length(int rate_idx, size_t length)
 {
     int samples_per_ms = valid_rates[rate_idx];
-    for (int i = 0; i < arraysize(valid_frame_times); i++) {
+    for (size_t i = 0; i < arraysize(valid_frame_times); i++) {
         if (valid_frame_times[i] * samples_per_ms == length)
             return true;
     }

tests/test_common.c

@@ -28,7 +28,7 @@ void expect_fail(const char *s, const char *file, int line)
 // function to be defined by individual tests
 void test_main(void);
 
-int main(int argc, char *argv[])
+int main()
 {
     test_main();
     if (expect_failed) exit(2);