Module Name: src
Committed By: pooka
Date: Mon Feb 28 20:39:07 UTC 2011
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
make compiler sign-happy
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/lib/librumphijack/hijack.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.71 src/lib/librumphijack/hijack.c:1.72
--- src/lib/librumphijack/hijack.c:1.71 Mon Feb 28 19:57:36 2011
+++ src/lib/librumphijack/hijack.c Mon Feb 28 20:39:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.71 2011/02/28 19:57:36 pooka Exp $ */
+/* $NetBSD: hijack.c,v 1.72 2011/02/28 20:39:07 pooka Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: hijack.c,v 1.71 2011/02/28 19:57:36 pooka Exp $");
+__RCSID("$NetBSD: hijack.c,v 1.72 2011/02/28 20:39:07 pooka Exp $");
#define __ssp_weak_name(fun) _hijack_ ## fun
@@ -271,7 +271,8 @@
int i;
for (i = 0; i <= DUP2HIGH; i++) {
- if (dup2vec[i] & DUP2BIT && (dup2vec[i] & DUP2FDMASK) == rumpfd)
+ if (dup2vec[i] & DUP2BIT &&
+ (dup2vec[i] & DUP2FDMASK) == (unsigned)rumpfd)
return i;
}
return -1;
@@ -1002,8 +1003,12 @@
*/
for (i = 0, maxdup2 = 0; i <= DUP2HIGH; i++) {
- if (dup2vec[i] & DUP2BIT)
- maxdup2 = MAX(dup2vec[i] & DUP2FDMASK, maxdup2);
+ if (dup2vec[i] & DUP2BIT) {
+ int val;
+
+ val = dup2vec[i] & DUP2FDMASK;
+ maxdup2 = MAX(val, maxdup2);
+ }
}
if (fd >= HIJACK_FDOFF)
