osutil: more cleanups

- eliminate a level of nesting
- untab targets of gotos

mercurial/osutil.c

@@ -215,7 +215,9 static PyObject *listdir(PyObject *self,
 	dfd = dirfd(dir);
 #endif
 
-	if (do_stat || !all_kinds) {
+	if (!(do_stat || !all_kinds))
+		goto done;
+
 		for (i = 0; i < size; i++) {
 			PyObject *elt = PyList_GetItem(list, i);
 			char *name = PyString_AsString(PyTuple_GET_ITEM(elt, 0));
@@ -228,8 +230,7 static PyObject *listdir(PyObject *self,
 			if (kind != -1 && !do_stat)
 				continue;
 
-			strncat(full_path + path_len + 1, name,
-				PATH_MAX - path_len);
+		strncat(full_path + path_len + 1, name, PATH_MAX - path_len);
 			full_path[PATH_MAX] = 0;
 
 			if (do_stat) {
@@ -292,7 +293,6 static PyObject *listdir(PyObject *self,
 				PyTuple_SET_ITEM(elt, 2, py_st);
 			}
 		}
-	}
 
 	goto done;