[thirdparty-commits] rmudgett: mISDNuser/trunk r22 - in /mISDNuser/trunk: ./ example/ i4lnet/ incl...

[SVN commits to the Digium third-party software repository]

Author: rmudgett
Date: Thu Sep  4 11:00:05 2008
New Revision: 22

URL: http://svn.digium.com/view/thirdparty?view=rev&rev=22
Log:
Fixed some compiler warnings and added some comments

Modified:
    mISDNuser/trunk/Makefile
    mISDNuser/trunk/example/testlayer1.c
    mISDNuser/trunk/i4lnet/bchannel.c
    mISDNuser/trunk/include/isdn_msg.h
    mISDNuser/trunk/include/mISDNlib.h

Modified: mISDNuser/trunk/Makefile
URL: http://svn.digium.com/view/thirdparty/mISDNuser/trunk/Makefile?view=diff&rev=22&r1=21&r2=22
==============================================================================
--- mISDNuser/trunk/Makefile (original)
+++ mISDNuser/trunk/Makefile Thu Sep  4 11:00:05 2008
@@ -4,9 +4,10 @@
 SUBMINOR=8
 
 #
-# Set this to your local copy of mISDN
+# Set MISDNDIR to your local copy of mISDN
 #
-MISDNDIR := /usr/src/mqueue/mISDN
+# MISDNDIR is defaulted to where mISDN installs its header files
+MISDNDIR := /usr
 
 PWD=$(shell pwd)
 #

Modified: mISDNuser/trunk/example/testlayer1.c
URL: http://svn.digium.com/view/thirdparty/mISDNuser/trunk/example/testlayer1.c?view=diff&rev=22&r1=21&r2=22
==============================================================================
--- mISDNuser/trunk/example/testlayer1.c (original)
+++ mISDNuser/trunk/example/testlayer1.c Thu Sep  4 11:00:05 2008
@@ -197,7 +197,7 @@
 		}
 		
 		if ((get_tick_count() - t1)  > (TICKS_PER_SEC * 5)) {
-			printf(stdout, "unable to activate layer1 (TIMEOUT)\n");
+			fprintf(stdout, "unable to activate layer1 (TIMEOUT)\n");
 			return(6);
 		}
 	}

Modified: mISDNuser/trunk/i4lnet/bchannel.c
URL: http://svn.digium.com/view/thirdparty/mISDNuser/trunk/i4lnet/bchannel.c?view=diff&rev=22&r1=21&r2=22
==============================================================================
--- mISDNuser/trunk/i4lnet/bchannel.c (original)
+++ mISDNuser/trunk/i4lnet/bchannel.c Thu Sep  4 11:00:05 2008
@@ -1336,7 +1336,7 @@
 					send_userinfo(bc);
 					break;
 				case CC_TIMEOUT | INDICATION:
-					dprint(DBGM_MAN,"%s: bc%d got CC_TIMEOUT\n", __FUNCTION__,
+					dprint(DBGM_MAN, -1, "%s: bc%d got CC_TIMEOUT\n", __FUNCTION__,
 						bc->channel);
 					break;
 				default:

Modified: mISDNuser/trunk/include/isdn_msg.h
URL: http://svn.digium.com/view/thirdparty/mISDNuser/trunk/include/isdn_msg.h?view=diff&rev=22&r1=21&r2=22
==============================================================================
--- mISDNuser/trunk/include/isdn_msg.h (original)
+++ mISDNuser/trunk/include/isdn_msg.h Thu Sep  4 11:00:05 2008
@@ -54,6 +54,9 @@
 	return(list_->len);
 }
 
+/*! 
+ * \brief Put newm at the head of the queue list
+ */
 static inline void msg_queue_head(msg_queue_t *list, msg_t *newm)
 {
 	msg_t *prev, *next;
@@ -71,6 +74,9 @@
 }
 
 
+/*! 
+ * \brief Put newm at the tail of the queue list
+ */
 static inline void msg_queue_tail(msg_queue_t *list, msg_t *newm)
 {
 	msg_t *prev, *next;
@@ -88,6 +94,9 @@
 }
 
 
+/*! 
+ * \brief Get the head of the queue list
+ */
 static inline msg_t *msg_dequeue(msg_queue_t *list)
 {
 	msg_t *next, *prev, *result;
@@ -97,11 +106,16 @@
 	next = prev->next;
 	result = NULL;
 	if (next && next != prev) {
+		/* The queue is not empty */
 		result = next;
+
+		/* Extract head from queue list */
 		next = next->next;
 		list->len--;
 		next->prev = prev;
 		prev->next = next;
+
+		/* Clean up extracted node */
 		result->next = NULL;
 		result->prev = NULL;
 		result->list = NULL;

Modified: mISDNuser/trunk/include/mISDNlib.h
URL: http://svn.digium.com/view/thirdparty/mISDNuser/trunk/include/mISDNlib.h?view=diff&rev=22&r1=21&r2=22
==============================================================================
--- mISDNuser/trunk/include/mISDNlib.h (original)
+++ mISDNuser/trunk/include/mISDNlib.h Thu Sep  4 11:00:05 2008
@@ -24,7 +24,7 @@
 
 typedef struct _iframe {
 	u_int	addr __attribute__((packed));
-	u_int	prim __attribute__((packed));
+	u_int	prim __attribute__((packed));	/* primitive command for information exchange (Defines in mISDNif.h) */
 	int	dinfo __attribute__((packed));
 	int	len __attribute__((packed));
 	union {