Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / clients / resample.c

diff --git a/clients/resample.c b/clients/resample.c
index 8ba1843bc5ee3a1aeb3e4aa06efe967669b3d7c8..f02cde71776ef761f7a1b2587dd58df7391acab3 100644 (file)
--- a/clients/resample.c
+++ b/clients/resample.c
@@ -15,6 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+/** @file clients/resample.c
+ * @brief Audio resampler
+ */
 #include "common.h"
 
 #include <unistd.h>
@@ -56,7 +59,7 @@ static const struct option options[] = {
 };
 
 /* display usage message and terminate */
-static void help(void) {
+static void attribute((noreturn)) help(void) {
   xprintf("Usage:\n"
          "  resample [OPTIONS] < INPUT > OUTPUT\n"
          "Options:\n"
@@ -130,7 +133,7 @@ int main(int argc, char **argv) {
       default: disorder_fatal(0, "unknown endianness '%s'", optarg);
       }
       break;
-    default: fatal(0, "invalid option");
+    default: disorder_fatal(0, "invalid option");
     }
   }
   struct resampler rs[1];