[maemo-commits] [maemo-commits] r16292 - in projects/connectivity/osso-obexsrv/trunk: debian src

[From: subversion at stage.maemo.org]

Author: jh
Date: 2008-09-30 10:40:00 +0300 (Tue, 30 Sep 2008)
New Revision: 16292

Modified:
   projects/connectivity/osso-obexsrv/trunk/debian/rules
   projects/connectivity/osso-obexsrv/trunk/src/dbus.c
   projects/connectivity/osso-obexsrv/trunk/src/log.h
Log:
Disable debug output by default

Modified: projects/connectivity/osso-obexsrv/trunk/debian/rules
===================================================================
--- projects/connectivity/osso-obexsrv/trunk/debian/rules	2008-09-29 18:04:55 UTC (rev 16291)
+++ projects/connectivity/osso-obexsrv/trunk/debian/rules	2008-09-30 07:40:00 UTC (rev 16292)
@@ -3,6 +3,14 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2 -DNDEBUG
+endif
+export CFLAGS
+
 DEB_DH_INSTALLINIT_ARGS := --name=obexsrv
 DEB_UPDATE_RCD_PARAMS := "start 70 2 3 4 . stop 20 0 1 5 6 ."
 

Modified: projects/connectivity/osso-obexsrv/trunk/src/dbus.c
===================================================================
--- projects/connectivity/osso-obexsrv/trunk/src/dbus.c	2008-09-29 18:04:55 UTC (rev 16291)
+++ projects/connectivity/osso-obexsrv/trunk/src/dbus.c	2008-09-30 07:40:00 UTC (rev 16292)
@@ -239,6 +239,7 @@
     .unregister_function = NULL
 };
 
+#ifndef NDEBUG
 static const char *name_error_string(int ret)
 {
     switch (ret) {
@@ -252,6 +253,7 @@
             return "";
     }
 }
+#endif
 
 /* Create bindings for D-Bus handlers */
 gboolean init_dbus(void)

Modified: projects/connectivity/osso-obexsrv/trunk/src/log.h
===================================================================
--- projects/connectivity/osso-obexsrv/trunk/src/log.h	2008-09-29 18:04:55 UTC (rev 16291)
+++ projects/connectivity/osso-obexsrv/trunk/src/log.h	2008-09-30 07:40:00 UTC (rev 16292)
@@ -39,10 +39,10 @@
 # define report(...) g_message(__VA_ARGS__)
 #endif
 
-#ifdef DEBUG
+#ifdef NDEBUG
+# define debug(...) ((void)(0))
+#else
 # define debug(...) g_debug(__VA_ARGS__)
-#else
-# define debug(...) ((void)(0))
 #endif
 
 /** Setup logging functionality