[Vtun-Commit] CVS: 2 files have been modified in vtun/svr4.
Status: Inactive
Brought to you by:
mtbishop
|
From: Bishop <mtb...@us...> - 2006-12-11 07:55:06
|
The following files were modified in vtun/svr4:
Name Old version New version Comment
---- ----------- ----------- -------
tap_dev.c 1.3 1.4=20=20=20=20=20=20=20=20=20=20=20=20=20
tun_dev.c 1.4 1.5=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Merging 3.0 devel back into HEAD
The diff of the modified file(s):
--- tap_dev.c 22 Jan 2002 09:53:00 -0000 1.3
+++ tap_dev.c 11 Dec 2006 07:55:06 -0000 1.4
@@ -17,7 +17,7 @@
*/
=20
/*
- * tap_dev.c,v 1.2 2001/09/20 06:26:41 talby Exp
+ * tap_dev.c,v 1.1.1.1.2.2.2.1 2006/11/16 04:05:08 mtbishop Exp
*/
=20
#include "config.h"
@@ -73,8 +73,7 @@
=20
if (*dev) {
ptr =3D dev;
- while (*ptr && !isdigit((int) *ptr))
- ptr++;
+ while( *ptr && !isdigit((int)*ptr) ) ptr++;=20
ppa =3D atoi(ptr);
}
=20
--- tun_dev.c 22 Jan 2002 09:53:00 -0000 1.4
+++ tun_dev.c 11 Dec 2006 07:55:06 -0000 1.5
@@ -17,7 +17,7 @@
*/
=20
/*
- * tun_dev.c,v 1.3 2001/09/20 06:26:41 talby Exp
+ * tun_dev.c,v 1.2.2.2.2.1 2006/11/16 04:05:18 mtbishop Exp
*/
=20
#include "config.h"
@@ -75,8 +75,7 @@
=20
if (*dev) {
ptr =3D dev;
- while (*ptr && !isdigit((int) *ptr))
- ptr++;
+ while( *ptr && !isdigit((int)*ptr) ) ptr++;=20
ppa =3D atoi(ptr);
}
=20
@@ -155,8 +154,7 @@
return 0;
}
=20
- close(ip_fd);
- close(fd);
+ close(ip_fd); close(fd);
return 0;
}
=20
|