libsysio-commit

[Libsysio-commit] RELEASE_1_3: libsysio/src init.c

[Lee W. <lw...@us...>]

Update of /cvsroot/libsysio/libsysio/src
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13912

Modified Files:
      Tag: RELEASE_1_3
	init.c 
Log Message:


>From Bob Glossman (bo...@cr...):

Simplification and removal of a constant check in the namespace boot
parsing.


Index: init.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/init.c,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -u -w -b -B -p -r1.38 -r1.38.2.1
--- init.c	20 Aug 2007 19:12:08 -0000	1.38
+++ init.c	26 Sep 2007 19:41:39 -0000	1.38.2.1
@@ -830,8 +830,7 @@ _sysio_boot_namespace(const char *arg)
 		/*
 		 * Discard leading white space.
 		 */
-		while ((c = *arg) != '\0' &&
-		       !(c == '{' || strchr(IGNORE_WHITE, c) == NULL))
+		while ((c = *arg) != '\0' && strchr(IGNORE_WHITE, c))
 			arg++;
 		if (COMMENT_INTRO == c) {
 			/*

[Libsysio-commit] RELEASE_1_3: libsysio/src init.c

[Ruth K. <rk...@us...>]

Update of /cvsroot/libsysio/libsysio/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27581/src

Modified Files:
      Tag: RELEASE_1_3
	init.c 
Log Message:
additional files for /dev/{null,zero,full}

Index: init.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/init.c,v
retrieving revision 1.38.2.1
retrieving revision 1.38.2.2
diff -u -w -b -B -p -r1.38.2.1 -r1.38.2.2
--- init.c	26 Sep 2007 19:41:39 -0000	1.38.2.1
+++ init.c	16 Jun 2008 19:01:16 -0000	1.38.2.2
@@ -222,6 +222,11 @@ _sysio_init()
 	if (err)
 		goto error;
 #endif
+#ifdef STDDEV_DEV
+	err = _sysio_stddev_init();
+	if (err)
+		goto error;
+#endif
 #ifdef WITH_SOCKETS
         err = _sysio_sockets_init();
         if (err)
@@ -369,17 +374,22 @@ parse_mm(const char *s, dev_t *devp)
 	unsigned long ul;
 	char	*cp;
 	dev_t	dev;
+	dev_t   major, minor;
 
 	ul = strtoul(s, &cp, 0);
 	if (*cp != '+' || ul > USHRT_MAX)
 		return -EINVAL;
-	dev = ul << 16;
+	major = ul;
+	if (major != ul)
+		return -ERANGE;
 	s = (const char *)++cp;
 	ul = strtoul(s, &cp, 0);
 	if (*cp != '\0' || ul > USHRT_MAX)
 		return -EINVAL;
-	dev |= ul & 0xffff;
-	*devp = dev;
+	minor = ul;
+	if (minor != ul);
+		return -ERANGE;
+	*devp = SYSIO_MKDEV(major, minor);
 	return 0;
 }
 

[Libsysio-commit] RELEASE_1_3: libsysio/src init.c

[Lee W. <lw...@us...>]

Update of /cvsroot/libsysio/libsysio/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20143

Modified Files:
      Tag: RELEASE_1_3
	init.c 
Log Message:


In parse_mm function, removed spurious semi-colon that reliably caused
the function to error out. Also, removed unused variable in the
same function.


Index: init.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/init.c,v
retrieving revision 1.38.2.2
retrieving revision 1.38.2.3
diff -u -w -b -B -p -r1.38.2.2 -r1.38.2.3
--- init.c	16 Jun 2008 19:01:16 -0000	1.38.2.2
+++ init.c	17 Jun 2008 14:45:29 -0000	1.38.2.3
@@ -62,6 +62,9 @@
 #ifdef STDFD_DEV
 #include "stdfd.h"
 #endif
+#ifdef STDDEV_DEV
+#include "stddev.h"
+#endif
 
 /*
  * White space characters.
@@ -373,7 +376,6 @@ parse_mm(const char *s, dev_t *devp)
 {
 	unsigned long ul;
 	char	*cp;
-	dev_t	dev;
 	dev_t   major, minor;
 
 	ul = strtoul(s, &cp, 0);
@@ -387,7 +389,7 @@ parse_mm(const char *s, dev_t *devp)
 	if (*cp != '\0' || ul > USHRT_MAX)
 		return -EINVAL;
 	minor = ul;
-	if (minor != ul);
+	if (minor != ul)
 		return -ERANGE;
 	*devp = SYSIO_MKDEV(major, minor);
 	return 0;