From 6f68587ad59a2e5f606a332b96e55f57a0f9a5fc Mon Sep 17 00:00:00 2001
From: "J. Alexander Treuman" <jat@spatialrift.net>
Date: Tue, 15 May 2007 23:23:09 +0000
Subject: [PATCH] Changing "//" comments to "/* */" comments.
git-svn-id: https://svn.musicpd.org/mpd/trunk@6112 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---
src/interface.c | 6 +++---
src/ioops.h | 26 +++++++++++++++-----------
src/zeroconf.c | 2 +-
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/interface.c b/src/interface.c
index 31785f7e6..fabc2d6e9 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -511,7 +511,7 @@ int doIOForInterfaces(void)
addInterfacesReadyToReadAndListenSocketToFdSet(&rfds, &fdmax);
addInterfacesForBufferFlushToFdSet(&wfds, &fdmax);
- // Add fds for all registered IO handlers
+ /* Add fds for all registered IO handlers */
if( ioList ) {
struct ioOps *o = ioList;
while( o ) {
@@ -530,7 +530,7 @@ int doIOForInterfaces(void)
if (selret < 0 && errno == EINTR)
break;
- // Consume fds for all registered IO handlers
+ /* Consume fds for all registered IO handlers */
if( ioList ) {
struct ioOps *o = ioList;
while( o ) {
@@ -832,7 +832,7 @@ static void printInterfaceOutBuffer(Interface * interface)
interface->send_buf_used = 0;
}
-// From ioops.h:
+/* From ioops.h: */
void registerIO( struct ioOps *ops )
{
assert( ops != NULL );
diff --git a/src/ioops.h b/src/ioops.h
index c9187dcc1..e797a7153 100644
--- a/src/ioops.h
+++ b/src/ioops.h
@@ -24,24 +24,28 @@
struct ioOps {
struct ioOps *prev, *next;
- // Called before each 'select' statement.
- // To register for IO, call FD_SET for each required queue
- // Return the highest fd number you registered
+ /*
+ * Called before each 'select' statement.
+ * To register for IO, call FD_SET for each required queue
+ * Return the highest fd number you registered
+ */
int (*fdset) ( fd_set *rfds, fd_set *wfds, fd_set *efds );
- // Called after each 'select' statement.
- // fdCount is the number of fds total in all sets. It may be 0.
- // For each fd you registered for in (fdset), you should FD_CLR it from the
- // appropriate queue(s).
- // Return the total number of fds left in all sets (Ie, return fdCount
- // minus the number of times you called FD_CLR).
+ /*
+ * Called after each 'select' statement.
+ * fdCount is the number of fds total in all sets. It may be 0.
+ * For each fd you registered for in (fdset), you should FD_CLR it from the
+ * appropriate queue(s).
+ * Return the total number of fds left in all sets (Ie, return fdCount
+ * minus the number of times you called FD_CLR).
+ */
int (*consume) ( int fdCount, fd_set *rfds, fd_set *wfds, fd_set *efds );
};
-// Call this to register your io operation handler struct
+/* Call this to register your io operation handler struct */
void registerIO( struct ioOps *ops );
-// Call this to deregister your io operation handler struct
+/* Call this to deregister your io operation handler struct */
void deregisterIO( struct ioOps *ops );
#endif
diff --git a/src/zeroconf.c b/src/zeroconf.c
index 50e4c9c17..eeec794cd 100644
--- a/src/zeroconf.c
+++ b/src/zeroconf.c
@@ -494,5 +494,5 @@ void finishZeroconf(void)
avahi_free( avahiName );
avahiName = NULL;
-#endif // HAVE_AVAHI
+#endif /* HAVE_AVAHI */
}