libIDL r600 - trunk

[kmaraas svn gnome org]

Author: kmaraas
Date: Thu Jan 22 12:30:07 2009
New Revision: 600
URL: http://svn.gnome.org/viewvc/libIDL?rev=600&view=rev

Log:
2008-09-17  Kjartan Maraas  <kmaraas gnome org>

	* util.c: clean up some warnings from sparse/gcc.
	Closes bug #568677.

Modified:
   trunk/Makefile.am
   trunk/util.c

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Thu Jan 22 12:30:07 2009
@@ -11,8 +11,8 @@
 INCLUDES =                             \
 	-DYYDEBUG=1                    \
 	-DYYERROR_VERBOSE=1            \
-	$(LIBIDL_CFLAGS)               \
 	-I$(top_builddir)/include      \
+	$(LIBIDL_CFLAGS)               \
 	-DG_LOG_DOMAIN=\"libIDL\"      \
 	$(WARN_CFLAGS)
 

Modified: trunk/util.c
==============================================================================
--- trunk/util.c	(original)
+++ trunk/util.c	Thu Jan 22 12:30:07 2009
@@ -227,10 +227,10 @@
 	FILE *input;
 	char *cmd;
 #ifdef HAVE_CPP_PIPE_STDIN
-	char *fmt = CPP_PROGRAM " " CPP_NOSTDINC " - %s%s %s < \"%s\" %s";
+	char *fmt = CPP_PROGRAM " - %s%s %s < \"%s\" %s";
 	char *wd;
 #else
-	char *fmt = CPP_PROGRAM " " CPP_NOSTDINC " -I- -I%s %s \"%s\" %s";
+	char *fmt = CPP_PROGRAM " -I%s %s \"%s\" %s";
 	char cwd[2048];
 #ifdef HAVE_SYMLINK
 	char *s, *tmpfilename;
@@ -2604,7 +2604,7 @@
 {
 	if (IDL_output_delim_match (tfd, delim)) {
 		if (delim->hit)
-			dataf (delim->data, delim->delim);
+			dataf (delim->data, "%s", delim->delim);
 		else
 			delim->hit = TRUE;
 		return delim->pre_func
@@ -2770,7 +2770,7 @@
 		   prepending an underscore. */
 		dataf (data, "%s", IDL_IDENT (tfd->tree).str);
 	} else {
-		if ( up_path == 0 ) {
+		if (up_path == NULL) {
 		    levels = 0;
 		} else {
 		    /* Determine minimal required levels of scoping */
@@ -3528,7 +3528,7 @@
 contains_node_walker (IDL_tree_func_data *tfd, gpointer data) {
 	ContainsNodeWalkerInfo	*info = data;
 	/* skip root! */
-	if ( tfd->up!=0 && tfd->tree == info->searchNode ) {
+	if (tfd->up != NULL && tfd->tree == info->searchNode) {
 		info->found = TRUE;
 		return FALSE;
 	}