plan9port

commit 4515de8f502e7784d7901ef42ca3e4cecae07a09
parent e6dad55ae3498c3b13a700e4a8b5c586e444618d
Author: rsc <devnull@localhost>
Date:   Thu, 20 Apr 2006 20:18:13 +0000

silence warning (andrey)

Diffstat:
M
src/cmd/tar.c
 | 
3
++-
M
src/libregexp/regcomp.c
 | 
10
+++++-----

2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/cmd/tar.c b/src/cmd/tar.c
@@ -16,7 +16,8 @@
  * keyletters and options.
  */
 #define	TARGBEGIN {\
-	(argv0 || (argv0 = *argv)), argv++, argc--;\
+	if (!argv0) argv0 = *argv; \
+	argv++, argc--;\
 	if (argv[0]) {\
 		char *_args, *_argt;\
 		Rune _argc;\
diff --git a/src/libregexp/regcomp.c b/src/libregexp/regcomp.c
@@ -261,18 +261,18 @@ optimize(Reprog *pp)
 		case STAR:
 		case PLUS:
 		case QUEST:
-			*(char **)&inst->u1.right += diff;
+			*(char**)(void*)&inst->u1.right += diff;
 			break;
 		case CCLASS:
 		case NCCLASS:
-			*(char **)&inst->u1.right += diff;
+			*(char**)(void*)&inst->u1.right += diff;
 			cl = inst->u1.cp;
-			*(char **)&cl->end += diff;
+			*(char**)(void*)&cl->end += diff;
 			break;
 		}
-		*(char **)&inst->u2.left += diff;
+		*(char**)(void*)&inst->u2.left += diff;
 	}
-	*(char **)&npp->startinst += diff;
+	*(char**)(void*)&npp->startinst += diff;
 	return npp;
 }