aboutsummaryrefslogtreecommitdiff
path: root/jim-readdir.c
diff options
context:
space:
mode:
authorSteve Bennett <steveb@workware.net.au>2014-01-06 23:46:29 +1000
committerSteve Bennett <steveb@workware.net.au>2014-01-15 07:46:33 +1000
commitbbc6bf3b0a5d48bf5a651e987605ce4e71a29943 (patch)
tree9906caf9d49daf2b16ec13fa2b1f378b49aed4a1 /jim-readdir.c
parent5f31686cb40c5b84638dbb5ffe1ad327440e1903 (diff)
downloadjimtcl-bbc6bf3b0a5d48bf5a651e987605ce4e71a29943.zip
jimtcl-bbc6bf3b0a5d48bf5a651e987605ce4e71a29943.tar.gz
jimtcl-bbc6bf3b0a5d48bf5a651e987605ce4e71a29943.tar.bz2
readdir: minor code cleanups
Signed-off-by: Steve Bennett <steveb@workware.net.au>
Diffstat (limited to 'jim-readdir.c')
-rw-r--r--jim-readdir.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/jim-readdir.c b/jim-readdir.c
index a405692..d7c0e40 100644
--- a/jim-readdir.c
+++ b/jim-readdir.c
@@ -1,4 +1,3 @@
-
/*
* Tcl readdir command.
*
@@ -92,24 +91,25 @@ int Jim_ReaddirCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
Jim_SetResultString(interp, strerror(errno), -1);
return JIM_ERR;
}
- Jim_SetResultString(interp, strerror(errno), -1);
-
- Jim_SetResult(interp, Jim_NewListObj(interp, NULL, 0));
+ else {
+ Jim_Obj *listObj = Jim_NewListObj(interp, NULL, 0);
- while ((entryPtr = readdir(dirPtr)) != NULL) {
- if (entryPtr->d_name[0] == '.') {
- if (entryPtr->d_name[1] == '\0') {
- continue;
+ while ((entryPtr = readdir(dirPtr)) != NULL) {
+ if (entryPtr->d_name[0] == '.') {
+ if (entryPtr->d_name[1] == '\0') {
+ continue;
+ }
+ if ((entryPtr->d_name[1] == '.') && (entryPtr->d_name[2] == '\0'))
+ continue;
}
- if ((entryPtr->d_name[1] == '.') && (entryPtr->d_name[2] == '\0'))
- continue;
+ Jim_ListAppendElement(interp, listObj, Jim_NewStringObj(interp, entryPtr->d_name, -1));
}
- Jim_ListAppendElement(interp, Jim_GetResult(interp), Jim_NewStringObj(interp,
- entryPtr->d_name, -1));
- }
- closedir(dirPtr);
+ closedir(dirPtr);
- return JIM_OK;
+ Jim_SetResult(interp, listObj);
+
+ return JIM_OK;
+ }
}
int Jim_readdirInit(Jim_Interp *interp)