osutil: cleanups

- use tabs
- eliminate old-style function pointer calls
- eliminate weird scoping
- eliminate assignment-in-iff
- use !foo rather than foo == NULL

mercurial/osutil.c

@@ -47,12 +47,12 static struct PyGetSetDef listdir_stat_g
 
 static PyObject *listdir_stat_new(PyTypeObject *t, PyObject *a, PyObject *k)
 {
-    return (*t->tp_alloc)(t, 0);
+	return t->tp_alloc(t, 0);
 }
 
 static void listdir_stat_dealloc(PyObject *o)
 {
-    (*o->ob_type->tp_free)(o);
+	o->ob_type->tp_free(o);
 }
 
 static PyTypeObject listdir_stat_type = {
@@ -111,6 +111,8 static inline int mode_to_kind(int mode)
 
 static PyObject *listdir(PyObject *self, PyObject *args, PyObject *kwargs)
 {
+	static char *kwlist[] = { "path", "stat", NULL };
+	PyObject *statobj = NULL;
     DIR *dir = NULL;
     struct dirent *ent;
     PyObject *list = NULL;
@@ -121,38 +123,38 static PyObject *listdir(PyObject *self,
     int do_stat;
     char *path;
     int ret;
-
-    {
-	static char *kwlist[] = { "path", "stat", NULL };
-	PyObject *statobj = NULL;
+	ssize_t size;
+	ssize_t i;
+	int dfd;
 
 	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s#|O:listdir", kwlist,
 					 &path, &path_len, &statobj))
 	    goto bail;
 
 	do_stat = statobj && PyObject_IsTrue(statobj);
-    }
 
-    if ((dir = opendir(path)) == NULL) {
+	dir = opendir(path);
+	if (!dir) {
 	list = PyErr_SetFromErrnoWithFilename(PyExc_OSError, path);
         goto bail;
     }
 
-    if ((list = PyList_New(0)) == NULL)
+	list = PyList_New(0);
+	if (!list)
         goto bail;
 
     full_path = alloca(path_len + PATH_MAX + 2);
     memcpy(full_path, path, path_len);
     full_path[path_len] = '/';
 
-    while ((ent = readdir(dir))) {
+	for (ent = readdir(dir); ent; ent = readdir(dir)) {
         PyObject *name = NULL;
         PyObject *py_kind = NULL;
         PyObject *val = NULL;
         unsigned char d_type;
         int kind = -1;
 
-        if (strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0)
+		if (!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, ".."))
             continue;
 
 #ifdef DT_REG
@@ -190,11 +192,10 static PyObject *listdir(PyObject *self,
 
         val = PyTuple_New(do_stat ? 3 : 2);
 
-        if (name == NULL || py_kind == NULL || val == NULL) {
+		if (!name || !py_kind || !val) {
             Py_XDECREF(name);
             Py_XDECREF(py_kind);
             Py_XDECREF(val);
-
             goto bail;
 	}
 
@@ -210,14 +211,12 static PyObject *listdir(PyObject *self,
     }
 
     PyList_Sort(list);
+	size = PyList_Size(list);
+#ifdef AT_SYMLINK_NOFOLLOW
+	dfd = dirfd(dir);
+#endif
 
     if (do_stat || !all_kinds) {
-	ssize_t size = PyList_Size(list);
-	ssize_t i;
-#ifdef AT_SYMLINK_NOFOLLOW
-	int dfd = dirfd(dir);
-#endif
-
 	for (i = 0; i < size; i++) {
 	    PyObject *elt = PyList_GetItem(list, i);
 	    char *name = PyString_AsString(PyTuple_GET_ITEM(elt, 0));
@@ -235,16 +234,17 static PyObject *listdir(PyObject *self,
 	    if (do_stat) {
 		struct listdir_stat *st;
 
-		if (ctor_args == NULL) {
+				if (!ctor_args) {
 		    ctor_args = PyTuple_New(0);
-		    if (ctor_args == NULL)
+					if (!ctor_args)
 			goto bail;
 		}
 
 		st = (struct listdir_stat *)
 		    PyObject_CallObject((PyObject *) &listdir_stat_type,
 					ctor_args);
-		if (st == NULL)
+
+				if (!st)
 		    goto bail;
 #ifdef AT_SYMLINK_NOFOLLOW
 		ret = fstatat(dfd, name, &st->st, AT_SYMLINK_NOFOLLOW);
@@ -277,14 +277,14 static PyObject *listdir(PyObject *self,
 
 	    if (py_kind == Py_None && kind != -1) {
 		py_kind = PyInt_FromLong(kind);
-		if (py_kind == NULL)
+				if (!py_kind)
 		    goto bail;
 		Py_XDECREF(Py_None);
 		PyTuple_SET_ITEM(elt, 1, py_kind);
 	    }
 
 	    if (do_stat) {
-		if (py_st == NULL) {
+				if (!py_st) {
 		    py_st = Py_None;
 		    Py_INCREF(Py_None);
 		}
@@ -302,10 +302,10 done:
     Py_XDECREF(ctor_args);
     if (dir)
         closedir(dir);
-
     return list;
 }
 
+
 static char osutil_doc[] = "Native operating system services.";
 
 static PyMethodDef methods[] = {