Changeset 920 for current/host/trunk/empath/trunk

Timestamp:

04/03/07 09:47:33 (22 months ago)

Author:

codehelp

Message:

enabling compiler warnings

Location:

current/host/trunk/empath/trunk

Files:

• README (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• src/aptcache.cc (modified) (8 diffs)

current/host/trunk/empath/trunk/README

@@ -8 +8 @@
 The previous hack is no longer needed, just run:
 ./autogen.sh
-./configure
+./configure --enable-compile-warnings --enable-error-on-warning
 make
-svn-buildpackage
+svn-buildpackage -uc -us -rfakeroot
 
 Don't forget to update the manpage:

current/host/trunk/empath/trunk/configure.ac

@@ -69 +69 @@
 dnl *************************************
 AC_MSG_CHECKING(what extra warning flags to pass to the C compiler)
+warnFLAGS=
+set_compile_warnings=no
+AC_ARG_ENABLE(compile-warnings,
+              [  --enable-compile-warnings
+                          Enable verbose compiler warnings],
+              set_compile_warnings=yes)
+
+if test "$set_compile_warnings" != "no"; then
+warnFLAGS="${warnFLAGS} -Wcast-align -Winline -Wsign-compare -Wpointer-arith"
+fi
 if test ${GCC}x = yesx; then
-  warnFLAGS=
-  CFLAGS="${CFLAGS} -g2 -Wall"
+  CXXFLAGS="${CXXFLAGS} -g2 -Wall"
   AC_ARG_ENABLE(error-on-warning,
         [  --disable-error-on-warning    disable treating compile warnings as errors],
@@ -80 +89 @@
         esac],
         [  warnFLAGS="${warnFLAGS} -Werror" ])
-  GCC_VERSION=`${CC} -dumpversion`
-  if test `echo ${GCC_VERSION} | cut -d. -f1` -ge 3; then
-     # This is gcc >= 3.x.x
-     if test `echo ${GCC_VERSION} | cut -d. -f2` -ge 4; then
-        # This is gcc >= 3.4.x
-        warnFLAGS="${warnFLAGS} -Wdeclaration-after-statement"
-     else if test `echo ${GCC_VERSION} | cut -d. -f1` -ge 4; then
-        # This is gcc == 4.x.x
-        warnFLAGS="${warnFLAGS} -Wdeclaration-after-statement -Wno-pointer-sign"
-        LDFLAGS="${LDFLAGS} -Wl,--as-needed"
-        fi
-     fi
-     else if test `echo ${GCC_VERSION} | cut -d. -f1` -ge 4; then
-        # This is gcc == 4.x.x
-        warnFLAGS="${warnFLAGS} -Wdeclaration-after-statement -Wno-pointer-sign"
-    fi
-  fi
+  CXXFLAGS="$CXXFLAGS ${warnFLAGS}"
   CFLAGS="${CFLAGS} ${warnFLAGS}"
 else
@@ -102 +95 @@
 fi
 AC_MSG_RESULT($warnFLAGS)
-
-set_compile_warnings=no
-
-AC_ARG_ENABLE(compile-warnings,
-              [  --enable-compile-warnings
-                          Enable verbose compiler warnings],
-              set_compile_warnings=yes)
-
-if test "$GCC" = "yes" -a "$set_compile_warnings" != "no"; then
-        CFLAGS="$CFLAGS -Wcast-align -Wbad-function-cast \
- -Wstrict-prototypes -Wmissing-declarations -Winline -Wsign-compare \
- -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-fi
 
 case "$host" in

current/host/trunk/empath/trunk/src/aptcache.cc

@@ -65 +65 @@
 static GHashTable * srctree = NULL;
 static gint c = 0;
-static GList * ignore = NULL;
 static GList * sorted_list = NULL;
 static GHashTable * level_hash = NULL;
@@ -131 +130 @@
         sorted_list = g_list_sort (sorted_list, list_compare);
         fprintf (stdout, "%s\n", _("The following packages are ignored:"));
-        for (;sorted_list != NULL;sorted_list->next)
-        {
-                fprintf (stdout, "%s\n", sorted_list->data);
-                sorted_list = sorted_list->next;
+        for (GList * b = sorted_list; b != NULL; b = b->next)
+        {
+                fprintf (stdout, "%s\n", (gchar*)b->data);
         }
 }
@@ -141 +139 @@
 output_zero (gpointer key)
 {
-        fprintf (stdout, "%s '%s'", _("Package"), key);
+        fprintf (stdout, "%s '%s'", _("Package"), (gchar*)key);
         fprintf (stdout, "%s\n",
                 _(" can be cross-built from the current base set."));
@@ -234 +232 @@
         if (Fetcher.Run() == pkgAcquire::Failed)
                 return FALSE;
+        return TRUE;
 }
 
@@ -240 +239 @@
 {
         gchar * URI, * Dist, *Section;
-        gboolean IsSrc;
         gchar ** components;
 
@@ -273 +271 @@
 apt_init (const gchar * arch, gboolean debug_on)
 {
-        gchar * pkg, *home;
-        guint ScreenWidth = 80 - 1; /* - 1 for the cursor */
+        gchar *home;
         MMap *Map = 0;
-        gboolean All = _config->FindB("APT::Cache::AllNames","false");
+//      gboolean All = _config->FindB("APT::Cache::AllNames","false");
 
         /** \todo run update_cache if a marker is older than 24hrs? */
@@ -361 +358 @@
 {
         g_return_if_fail (package);
-        fprintf (stdout, _("Reading dependencies"), " .");
+        fprintf (stdout, "%s %s", _("Reading dependencies"), " .");
         fflush (stdout);
         check_depends (package, debug_on);
@@ -393 +390 @@
 {
         EmDepend * iter = NULL;
-        GList * check = NULL;
 
         if (aptcache_lookup(pkgname))