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 6c0bd3fd6d5786af50f0a43d8f4a43851b15a503..f02cde71776ef761f7a1b2587dd58df7391acab3 100644 (file)
--- a/clients/resample.c
+++ b/clients/resample.c
@@ -11,10 +11,13 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * 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"
@@ -116,6 +119,7 @@ int main(int argc, char **argv) {
       case 'n': case 'N': input_endian = ENDIAN_NATIVE; break;
       default: disorder_fatal(0, "unknown endianness '%s'", optarg);
       }
+      break;
     case 'B': output_bits = atoi(optarg); break;
     case 'C': output_channels = atoi(optarg); break;
     case 'R': output_rate = atoi(optarg); break;
@@ -128,7 +132,8 @@ int main(int argc, char **argv) {
       case 'n': case 'N': output_endian = ENDIAN_NATIVE; break;
       default: disorder_fatal(0, "unknown endianness '%s'", optarg);
       }
-    default: fatal(0, "invalid option");
+      break;
+    default: disorder_fatal(0, "invalid option");
     }
   }
   struct resampler rs[1];