[TRIVIAL][PATCH] double inclusions

[TRIVIAL][PATCH] double inclusions

[Nicolas Kaiser]

Remove two double inclusions.

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
---

 expression.c |    1 -
 symbol.c     |    1 -
 2 files changed, 2 deletions(-)

diff -uprN sparse-0.1.orig/expression.c sparse-0.1/expression.c
--- sparse-0.1.orig/expression.c	2006-11-06 20:26:11.000000000 +0100
+++ sparse-0.1/expression.c	2006-11-14 09:34:22.000000000 +0100
@@ -20,7 +20,6 @@
 
 #include "lib.h"
 #include "allocate.h"
-#include "allocate.h"
 #include "token.h"
 #include "parse.h"
 #include "symbol.h"
diff -uprN sparse-0.1.orig/symbol.c sparse-0.1/symbol.c
--- sparse-0.1.orig/symbol.c	2006-11-06 20:26:11.000000000 +0100
+++ sparse-0.1/symbol.c	2006-11-14 09:35:16.000000000 +0100
@@ -8,7 +8,6 @@
  */
 #include <stdlib.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "lib.h"

Re: [TRIVIAL][PATCH] double inclusions

[Josh Triplett]

[-- Attachment #1: Type: text/plain, Size: 154 bytes --]

Nicolas Kaiser wrote:
> Remove two double inclusions.
> 
> Signed-off-by: Nicolas Kaiser <nikai@nikai.net>

Applied, thanks.

- Josh Triplett



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 252 bytes --]

[PATCH] Fix warning on self check.

[Christopher Li]

Fix warning on self check

Sparse complain about the using do while without
compound statment in pre-process.c. This trivial patch
fixes that.

Signed-Off-By: Christopher Li <sparse@chrisli.org>

Index: sparse/pre-process.c
===================================================================
--- sparse.orig/pre-process.c	2006-11-22 04:05:10.000000000 -0800
+++ sparse/pre-process.c	2006-11-22 23:44:34.000000000 -0800
@@ -43,20 +43,24 @@
 static const char **angle_includepath = includepath + 1;
 static const char **sys_includepath   = includepath + 1;
 
-#define dirty_stream(stream)			\
-	do if (!stream->dirty) {		\
-		stream->dirty = 1;		\
-		if (!stream->ifndef)		\
-			stream->protect = NULL;	\
+#define dirty_stream(stream)				\
+	do {						\
+		if (!stream->dirty) {			\
+			stream->dirty = 1;		\
+			if (!stream->ifndef)		\
+				stream->protect = NULL;	\
+		}					\
 	} while(0)
 
-#define end_group(stream)				\
-	do if (stream->ifndef == stream->top_if) {	\
-		stream->ifndef = NULL;			\
-		if (!stream->dirty)			\
-			stream->protect = NULL;		\
-		else if (stream->protect)		\
-			stream->dirty = 0;		\
+#define end_group(stream)					\
+	do {							\
+		if (stream->ifndef == stream->top_if) {		\
+			stream->ifndef = NULL;			\
+			if (!stream->dirty)			\
+				stream->protect = NULL;		\
+			else if (stream->protect)		\
+				stream->dirty = 0;		\
+		}						\
 	} while(0)
 
 #define nesting_error(stream)		\

Re: [PATCH] Fix warning on self check.

[Josh Triplett]

[-- Attachment #1: Type: text/plain, Size: 575 bytes --]

Christopher Li wrote:
> Fix warning on self check
> 
> Sparse complain about the using do while without
> compound statment in pre-process.c. This trivial patch
> fixes that.
> 
> Signed-Off-By: Christopher Li <sparse@chrisli.org>

Good catch, thanks!  Merged.

One request for future patches: please don't duplicate the subject in the
body.  git-am forms the commit message from both the subject and the body, and
thus duplicating the subject in the body will duplicate it in the commit
message.  I've manually fixed that for this patch.

- Josh Triplett


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 252 bytes --]