diff options
| author | Toomas Soome <tsoome@me.com> | 2018-11-27 12:26:29 +0200 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2019-02-04 11:10:45 -0500 |
| commit | 2325c4ff7eacda26747f8eb679e86fdaf23a7ff8 (patch) | |
| tree | 0d6314c0a59f7dfa56caeae4fdbf5205789c1720 /usr/src | |
| parent | 941b7e9c849240e1a04a25b32722d30dae557dc3 (diff) | |
| download | illumos-joyent-2325c4ff7eacda26747f8eb679e86fdaf23a7ff8.tar.gz | |
10303 audioconvert: ISO C++ forbids declaration of 'main' with no type
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Reviewed by: Andy Fiddaman <af@citrus-it.net>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/audio/audioconvert/main.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/usr/src/cmd/audio/audioconvert/main.cc b/usr/src/cmd/audio/audioconvert/main.cc index 9fa0b401b0..a097d75345 100644 --- a/usr/src/cmd/audio/audioconvert/main.cc +++ b/usr/src/cmd/audio/audioconvert/main.cc @@ -24,8 +24,6 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdlib.h> #include <stdio.h> #include <stdarg.h> @@ -60,9 +58,8 @@ int Debug = 0; void init_header(AudioHdr&); void usage(); -main( - int argc, - char *argv[]) +int +main(int argc, char *argv[]) { AudioUnixfile* ifp = NULL; // input & output audio objects AudioUnixfile* ofp = NULL; @@ -74,7 +71,7 @@ main( char *out_fmt = NULL; // output fmt string AudioError err; // for error msgs int c; // for getopt - int pflag = 0; // in place flag + int pflag = 0; // in place flag int fflag = 0; // ignore header (force conversion) int stdin_seen = 0; // already read stdin int israw = 0; // once we've seen -i, it's raw data @@ -278,7 +275,7 @@ main( // Create the file and set the info string. char *infoString; - int infoStringLen; + int infoStringLen; infoString = ifp->GetInfostring(infoStringLen); ofp = create_output_file(outfile, ohdr, ofmt, infoString); @@ -336,7 +333,7 @@ main( // Get the input info string. char *infoString; - int infoStringLen; + int infoStringLen; infoString = ifp->GetInfostring(infoStringLen); ofp = create_output_file(outfile, ohdr, ofmt, infoString); @@ -382,7 +379,7 @@ main( delete(ofp); // close output file } - exit(0); // outta here! + return (0); } |