2005-03-16 21:15:48

by Jesper Juhl

Subject: [PATCH] small fixes for example programs in Documentation/cdrom/sbpcd

Example programs in documentation files are great, but they are even
better when they compile :)

The second one, the "cdtester" utility, is still not completely happy, but
at least the patch fixes up most of the warnings and errors when trying to
build it. The first app is perfectly happy here after this patch.


Signed-off-by: Jesper Juhl <[email protected]>

diff -u linux-2.6.11-mm4-orig/Documentation/cdrom/sbpcd linux-2.6.11-mm4/Documentation/cdrom/sbpcd
--- linux-2.6.11-mm4-orig/Documentation/cdrom/sbpcd 2005-03-02 08:38:13.000000000 +0100
+++ linux-2.6.11-mm4/Documentation/cdrom/sbpcd 2005-03-16 22:11:18.000000000 +0100
@@ -419,6 +419,7 @@
*/
#include <stdio.h>
#include <sys/ioctl.h>
+#include <sys/types.h>
#include <linux/cdrom.h>

static struct cdrom_tochdr hdr;
@@ -429,7 +430,7 @@
static int i, j, limit, track, err;
static char filename[32];

-main(int argc, char *argv[])
+int main(int argc, char *argv[])
{
/*
* open /dev/cdrom
@@ -516,6 +517,7 @@
}
arg.addr.lba++;
}
+ return 0;
}
/*===================== end program ========================================*/

@@ -564,15 +566,16 @@
#include <stdio.h>
#include <malloc.h>
#include <sys/ioctl.h>
+#include <sys/types.h>
#include <linux/cdrom.h>

#ifdef AZT_PRIVATE_IOCTLS
#include <linux/../../drivers/cdrom/aztcd.h>
-#endif AZT_PRIVATE_IOCTLS
+#endif /* AZT_PRIVATE_IOCTLS */
#ifdef SBP_PRIVATE_IOCTLS
#include <linux/../../drivers/cdrom/sbpcd.h>
#include <linux/fs.h>
-#endif SBP_PRIVATE_IOCTLS
+#endif /* SBP_PRIVATE_IOCTLS */

struct cdrom_tochdr hdr;
struct cdrom_tochdr tocHdr;
@@ -590,7 +593,7 @@
struct cdrom_msf msf;
unsigned char buf[CD_FRAMESIZE_RAW];
} azt;
-#endif AZT_PRIVATE_IOCTLS
+#endif /* AZT_PRIVATE_IOCTLS */
int i, i1, i2, i3, j, k;
unsigned char sequence=0;
unsigned char command[80];
@@ -738,7 +741,7 @@
}
}

-main(int argc, char *argv[])
+int main(int argc, char *argv[])
{
printf("\nTesting tool for a CDROM driver's audio functions V0.1\n");
printf("(C) 1995 Eberhard Moenkeberg <[email protected]>\n");
@@ -1046,12 +1049,13 @@
rc=ioctl(drive,CDROMAUDIOBUFSIZ,j);
printf("%d frames granted.\n",rc);
break;
-#endif SBP_PRIVATE_IOCTLS
+#endif /* SBP_PRIVATE_IOCTLS */
default:
printf("unknown command: \"%s\".\n",command);
break;
}
}
+ return 0;
}
/*==========================================================================*/

2005-03-16 23:10:59

by Eberhard Moenkeberg

Subject: Re: [PATCH] small fixes for example programs in Documentation/cdrom/sbpcd

Hi,

On Wed, 16 Mar 2005, Jesper Juhl wrote:

> Example programs in documentation files are great, but they are even
> better when they compile :)
>
> The second one, the "cdtester" utility, is still not completely happy, but
> at least the patch fixes up most of the warnings and errors when trying to
> build it. The first app is perfectly happy here after this patch.

Thanks.
One small correction: your words "still not" should read "no longer".
Because old happiness already lasted more than 10 years (I guess 11,
because my son has grown to 23 meanwhile).

> -main(int argc, char *argv[])
> +int main(int argc, char *argv[])

> + return 0;

> -#endif SBP_PRIVATE_IOCTLS
> +#endif /* SBP_PRIVATE_IOCTLS */

> -#endif AZT_PRIVATE_IOCTLS
> +#endif /* AZT_PRIVATE_IOCTLS */

> -main(int argc, char *argv[])
> +int main(int argc, char *argv[])

> -#endif SBP_PRIVATE_IOCTLS
> +#endif /* SBP_PRIVATE_IOCTLS */
> + return 0;

Do it.
I'm kind of proud, only "cosmetical" changes after a whole
decennium. ;-))

Cheers -e
--
Eberhard Moenkeberg ([email protected], [email protected])