CINXE.COM

<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>LKML: Jesper Juhl: [PATCH] cosmetic fixes for example programs in Documentation/cdrom/sbpcd</title><link href="/css/message.css" rel="stylesheet" type="text/css" /><link href="/css/wrap.css" rel="alternate stylesheet" type="text/css" title="wrap" /><link href="/css/nowrap.css" rel="stylesheet" type="text/css" title="nowrap" /><link href="/favicon.ico" rel="shortcut icon" /><script src="/js/simple-calendar.js" type="text/javascript"></script><script src="/js/styleswitcher.js" type="text/javascript"></script><link rel="alternate" type="application/rss+xml" title="lkml.org : last 100 messages" href="/rss.php" /><link rel="alternate" type="application/rss+xml" title="lkml.org : last messages by Jesper Juhl" href="/groupie.php?aid=841" /><script> var _paq = window._paq = window._paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ _paq.push(["setDoNotTrack", true]); _paq.push(["disableCookies"]); _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { var u="//m.lkml.org/"; _paq.push(['setTrackerUrl', u+'matomo.php']); _paq.push(['setSiteId', '1']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s); })(); </script></head><body onload="es.jasper.simpleCalendar.init();" itemscope="itemscope" itemtype="http://schema.org/BlogPosting"><table border="0" cellpadding="0" cellspacing="0"><tr><td width="180" align="center"><a href="/"><img style="border:0;width:135px;height:32px" src="/images/toprowlk.gif" alt="lkml.org" /></a></td><td width="32">聽</td><td class="nb"><div><a class="nb" href="/lkml"> [lkml]</a> 聽 <a class="nb" href="/lkml/2005"> [2005]</a> 聽 <a class="nb" href="/lkml/2005/4"> [Apr]</a> 聽 <a class="nb" href="/lkml/2005/4/8"> [8]</a> 聽 <a class="nb" href="/lkml/last100"> [last100]</a> 聽 <a href="/rss.php"><img src="/images/rss-or.gif" border="0" alt="RSS Feed" /></a></div><div>Views: <a href="#" class="nowrap" onclick="setActiveStyleSheet('wrap');return false;">[wrap]</a><a href="#" class="wrap" onclick="setActiveStyleSheet('nowrap');return false;">[no wrap]</a> 聽 <a class="nb" href="/lkml/mheaders/2005/4/8/304" onclick="this.href='/lkml/headers'+'/2005/4/8/304';">[headers]</a>聽 <a href="/lkml/bounce/2005/4/8/304">[forward]</a>聽 </div></td><td width="32">聽</td></tr><tr><td valign="top"><div class="es-jasper-simpleCalendar" baseurl="/lkml/"></div><div class="threadlist">Messages in this thread</div><ul class="threadlist"><li class="root"><a href="/lkml/2005/4/8/304">First message in thread</a></li><li class="origin"><a href="/lkml/2005/4/8/307">Jesper Juhl</a><ul><li><a href="/lkml/2005/4/8/307">Eberhard Moenkeberg</a><ul><li><a href="/lkml/2005/4/8/309">Jesper Juhl</a><ul><li><a href="/lkml/2005/4/9/47">Eberhard Moenkeberg</a></li></ul></li></ul></li></ul></li></ul><div class="threadlist">Patch in this message</div><ul class="threadlist"><li><a href="/lkml/diff/2005/4/8/304/1">Get diff 1</a></li></ul></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerl.gif" width="32" height="32" alt="/" /></td><td class="c" rowspan="2" valign="top" style="padding-top: 1em"><table><tr><td><table><tr><td class="lp">Date</td><td class="rp" itemprop="datePublished">Sat, 9 Apr 2005 02:10:27 +0200 (CEST)</td></tr><tr><td class="lp">From</td><td class="rp" itemprop="author">Jesper Juhl <></td></tr><tr><td class="lp">Subject</td><td class="rp" itemprop="name">[PATCH] cosmetic fixes for example programs in Documentation/cdrom/sbpcd</td></tr></table></td><td></td></tr></table><pre itemprop="articleBody"><br />Hi Andrew,<br /><br />I'm sending this to you directly since Eberhard Moenkeberg already <br />indicated to me that he approves of the patch.<br /><br />This patch makes a few minor changes to the example programs in <br />Documentation/cdrom/sbpcd to kill off some warnings and build failures.<br /><br />Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk><br />---<br /><br /> sbpcd | 16 ++++++++++------<br /> 1 files changed, 10 insertions(+), 6 deletions(-)<br /><br />--- linux-2.6.12-rc2-mm2-orig/Documentation/cdrom/sbpcd 2005-03-02 08:38:13.000000000 +0100<br />+++ linux-2.6.12-rc2-mm2/Documentation/cdrom/sbpcd 2005-04-09 02:04:11.000000000 +0200<br />@@ -419,6 +419,7 @@<br /> */<br /> #include <stdio.h><br /> #include <sys/ioctl.h><br />+#include <sys/types.h><br /> #include <linux/cdrom.h><br /> <br /> static struct cdrom_tochdr hdr;<br />@@ -429,7 +430,7 @@<br /> static int i, j, limit, track, err;<br /> static char filename[32];<br /> <br />-main(int argc, char *argv[])<br />+int main(int argc, char *argv[])<br /> {<br /> /*<br /> * open /dev/cdrom<br />@@ -516,6 +517,7 @@<br /> }<br /> arg.addr.lba++;<br /> }<br />+ return 0;<br /> }<br /> /*===================== end program ========================================*/<br /> <br />@@ -564,15 +566,16 @@<br /> #include <stdio.h><br /> #include <malloc.h><br /> #include <sys/ioctl.h><br />+#include <sys/types.h><br /> #include <linux/cdrom.h><br /> <br /> #ifdef AZT_PRIVATE_IOCTLS<br /> #include <linux/../../drivers/cdrom/aztcd.h><br />-#endif AZT_PRIVATE_IOCTLS<br />+#endif /* AZT_PRIVATE_IOCTLS */<br /> #ifdef SBP_PRIVATE_IOCTLS<br /> #include <linux/../../drivers/cdrom/sbpcd.h><br /> #include <linux/fs.h><br />-#endif SBP_PRIVATE_IOCTLS<br />+#endif /* SBP_PRIVATE_IOCTLS */<br /> <br /> struct cdrom_tochdr hdr;<br /> struct cdrom_tochdr tocHdr;<br />@@ -590,7 +593,7 @@<br /> struct cdrom_msf msf;<br /> unsigned char buf[CD_FRAMESIZE_RAW];<br /> } azt;<br />-#endif AZT_PRIVATE_IOCTLS<br />+#endif /* AZT_PRIVATE_IOCTLS */<br /> int i, i1, i2, i3, j, k;<br /> unsigned char sequence=0;<br /> unsigned char command[80];<br />@@ -738,7 +741,7 @@<br /> } <br /> } <br /> <br />-main(int argc, char *argv[])<br />+int main(int argc, char *argv[])<br /> {<br /> printf("\nTesting tool for a CDROM driver's audio functions V0.1\n");<br /> printf("(C) 1995 Eberhard Moenkeberg <emoenke@gwdg.de>\n");<br />@@ -1046,12 +1049,13 @@<br /> rc=ioctl(drive,CDROMAUDIOBUFSIZ,j);<br /> printf("%d frames granted.\n",rc);<br /> break;<br />-#endif SBP_PRIVATE_IOCTLS<br />+#endif /* SBP_PRIVATE_IOCTLS */<br /> default:<br /> printf("unknown command: \"%s\".\n",command);<br /> break;<br /> }<br /> }<br />+ return 0;<br /> }<br /> /*==========================================================================*/<br /> <br /><br />-<br />To unsubscribe from this list: send the line "unsubscribe linux-kernel" in<br />the body of a message to majordomo@vger.kernel.org<br />More majordomo info at <a href="http://vger.kernel.org/majordomo-info.html">http://vger.kernel.org/majordomo-info.html</a><br />Please read the FAQ at <a href="http://www.tux.org/lkml/">http://www.tux.org/lkml/</a><br /><br /></pre></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerr.gif" width="32" height="32" alt="\" /></td></tr><tr><td align="right" valign="bottom"> 聽 </td></tr><tr><td align="right" valign="bottom">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerl.gif" width="32" height="32" alt="\" /></td><td class="c">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerr.gif" width="32" height="32" alt="/" /></td></tr><tr><td align="right" valign="top" colspan="2"> 聽 </td><td class="lm">Last update: 2005-04-09 02:13 聽聽 [from the cache]<br />漏2003-2020 <a href="http://blog.jasper.es/"><span itemprop="editor">Jasper Spaans</span></a>|hosted at <a href="https://www.digitalocean.com/?refcode=9a8e99d24cf9">Digital Ocean</a> and my Meterkast|<a href="http://blog.jasper.es/categories.html#lkml-ref">Read the blog</a></td><td>聽</td></tr></table><script language="javascript" src="/js/styleswitcher.js" type="text/javascript"></script></body></html>