[Python-checkins] r45505 - python/trunk/Modules/posixmodule.c

[skip.montanaro]

Author: skip.montanaro
Date: Tue Apr 18 02:49:49 2006
New Revision: 45505

Modified:
   python/trunk/Modules/posixmodule.c
Log:
reset errno before calling confstr - use confstr() doc to simplify checks afterwards

Modified: python/trunk/Modules/posixmodule.c
==============================================================================
--- python/trunk/Modules/posixmodule.c	(original)
+++ python/trunk/Modules/posixmodule.c	Tue Apr 18 02:49:49 2006
@@ -6812,17 +6812,19 @@
     char buffer[64];
 
     if (PyArg_ParseTuple(args, "O&:confstr", conv_confstr_confname, &name)) {
-        int len = confstr(name, buffer, sizeof(buffer));
+	int len;
 
         errno = 0;
-        if (len == 0) {
-            if (errno != 0)
-                posix_error();
-            else
-                result = PyString_FromString("");
+	len = confstr(name, buffer, sizeof(buffer));
+
+	if (len == -1) {
+	    posix_error();
+	}
+	else if (len == 0) {
+            result = PyString_FromString("");
         }
         else {
-            if (len >= sizeof(buffer)) {
+		if ((unsigned int)len >= sizeof(buffer)) {
                 result = PyString_FromStringAndSize(NULL, len);
                 if (result != NULL)
                     confstr(name, PyString_AS_STRING(result), len+1);