Align. Remove fprintf's.

3 files changed, 76 insertions, 5 deletions

diff --git a/libs/fs-wrapper.c b/libs/fs-wrapper.c
index 985af6b6e..eec2f5403 100644
--- a/libs/fs-wrapper.c
+++ b/libs/fs-wrapper.c
@@ -729,7 +729,39 @@ routine_to_str (const FsRoutine rot)
 #define RET(val) case val: return #val ;
   switch (rot)
     {
-    RET (FILE_EXEC) RET (FILE_CHOWN) RET (FILE_CHAUTHOR) RET (FILE_CHMOD) RET (FILE_CHFLAGS) RET (FILE_UTIMES) RET (FILE_SET_SIZE) RET (FILE_LOCK) RET (FILE_LOCK_STAT) RET (FILE_CHECK_ACCESS) RET (FILE_NOTICE_CHANGES) RET (FILE_GETCONTROL) RET (FILE_STATFS) RET (FILE_SYNC) RET (FILE_SYNCFS) RET (FILE_GET_STORAGE_INFO) RET (FILE_GETLINKNODE) RET (FILE_GETFH) RET (DIR_LOOKUP) RET (DIR_READDIR) RET (DIR_MKDIR) RET (DIR_RMDIR) RET (DIR_UNLINK) RET (DIR_LINK) RET (DIR_RENAME) RET (DIR_MKFILE) RET (DIR_NOTICE_CHANGES) RET (FILE_SET_TRANSLATOR) RET (FILE_GET_TRANSLATOR) RET (FILE_GET_TRANSLATOR_CNTL) RET (FILE_GET_FS_OPTIONS) RET (FILE_REPARENT) case _NUMBER_OF_ROUTINES:
+    RET (FILE_EXEC)
+    RET (FILE_CHOWN)
+    RET (FILE_CHAUTHOR)
+    RET (FILE_CHMOD)
+    RET (FILE_CHFLAGS)
+    RET (FILE_UTIMES)
+    RET (FILE_SET_SIZE)
+    RET (FILE_LOCK)
+    RET (FILE_LOCK_STAT)
+    RET (FILE_CHECK_ACCESS)
+    RET (FILE_NOTICE_CHANGES)
+    RET (FILE_GETCONTROL)
+    RET (FILE_STATFS)
+    RET (FILE_SYNC)
+    RET (FILE_SYNCFS)
+    RET (FILE_GET_STORAGE_INFO)
+    RET (FILE_GETLINKNODE)
+    RET (FILE_GETFH)
+    RET (DIR_LOOKUP)
+    RET (DIR_READDIR)
+    RET (DIR_MKDIR)
+    RET (DIR_RMDIR)
+    RET (DIR_UNLINK)
+    RET (DIR_LINK)
+    RET (DIR_RENAME)
+    RET (DIR_MKFILE)
+    RET (DIR_NOTICE_CHANGES)
+    RET (FILE_SET_TRANSLATOR)
+    RET (FILE_GET_TRANSLATOR)
+    RET (FILE_GET_TRANSLATOR_CNTL)
+    RET (FILE_GET_FS_OPTIONS)
+    RET (FILE_REPARENT)
+    case _NUMBER_OF_ROUTINES:
     default:
       return "";
     }
diff --git a/libs/fsys-wrapper.c b/libs/fsys-wrapper.c
index 00f610b8f..f48db91a8 100644
--- a/libs/fsys-wrapper.c
+++ b/libs/fsys-wrapper.c
@@ -122,8 +122,6 @@ lisp_S_fsys_getroot (fsys_t fsys,
 		   string_t retry_name,
 		   mach_port_t * file, mach_msg_type_name_t * filePoly)
 {
-//      fprintf(stderr, "Got in getroot %d\n", fsys);
-
   if (routines[FSYS_GETROOT] == NULL)
     {
       return EOPNOTSUPP;
@@ -336,7 +334,17 @@ routine_to_str (const FsysRoutine rot)
 #define RET(val) case val: return #val ;
   switch (rot)
     {
-    RET (FSYS_STARTUP) RET (FSYS_GOAWAY) RET (FSYS_GETROOT) RET (FSYS_GETFILE) RET (FSYS_SYNCFS) RET (FSYS_SET_OPTIONS) RET (FSYS_GETPRIV) RET (FSYS_INIT) RET (FSYS_FORWARD) RET (FSYS_GET_OPTIONS) case _NUMBER_OF_ROUTINES:
+    RET (FSYS_STARTUP)
+    RET (FSYS_GOAWAY)
+    RET (FSYS_GETROOT)
+    RET (FSYS_GETFILE)
+    RET (FSYS_SYNCFS)
+    RET (FSYS_SET_OPTIONS)
+    RET (FSYS_GETPRIV)
+    RET (FSYS_INIT)
+    RET (FSYS_FORWARD)
+    RET (FSYS_GET_OPTIONS)
+    case _NUMBER_OF_ROUTINES:
     default:
       return "";
     }
diff --git a/libs/io-wrapper.c b/libs/io-wrapper.c
index f2fe2f9a8..41658eab1 100644
--- a/libs/io-wrapper.c
+++ b/libs/io-wrapper.c
@@ -649,7 +649,38 @@ routine_to_str (const IoRoutine rot)
 #define RET(val) case val: return #val ;
   switch (rot)
     {
-    RET (IO_WRITE) RET (IO_READ) RET (IO_SEEK) RET (IO_READABLE) RET (IO_SET_SOME_OPENMODES) RET (IO_SET_ALL_OPENMODES) RET (IO_GET_OPENMODES) RET (IO_CLEAR_SOME_OPENMODES) RET (IO_ASYNC) RET (IO_MOD_OWNER) RET (IO_GET_OWNER) RET (IO_GET_ICKY_ASYNC_ID) RET (IO_SELECT) RET (IO_STAT) RET (IO_REAUTHENTICATE) RET (IO_RESTRICT_AUTH) RET (IO_DUPLICATE) RET (IO_SERVER_VERSION) RET (IO_MAP) RET (IO_MAP_CNTL) RET (IO_GET_CONCH) RET (IO_RELEASE_CONCH) RET (IO_EOFNOTIFY) RET (IO_PRENOTIFY) RET (IO_POSTNOTIFY) RET (IO_READNOTIFY) RET (IO_READSLEEP) RET (IO_SIGIO) RET (IO_PATHCONF) RET (IO_IDENTITY) RET (IO_REVOKE) case _NUMBER_OF_ROUTINES:
+    RET (IO_WRITE)
+    RET (IO_READ)
+    RET (IO_SEEK)
+    RET (IO_READABLE)
+    RET (IO_SET_SOME_OPENMODES)
+    RET (IO_SET_ALL_OPENMODES)
+    RET (IO_GET_OPENMODES)
+    RET (IO_CLEAR_SOME_OPENMODES)
+    RET (IO_ASYNC)
+    RET (IO_MOD_OWNER)
+    RET (IO_GET_OWNER)
+    RET (IO_GET_ICKY_ASYNC_ID)
+    RET (IO_SELECT)
+    RET (IO_STAT)
+    RET (IO_REAUTHENTICATE)
+    RET (IO_RESTRICT_AUTH)
+    RET (IO_DUPLICATE)
+    RET (IO_SERVER_VERSION)
+    RET (IO_MAP)
+    RET (IO_MAP_CNTL)
+    RET (IO_GET_CONCH)
+    RET (IO_RELEASE_CONCH)
+    RET (IO_EOFNOTIFY)
+    RET (IO_PRENOTIFY)
+    RET (IO_POSTNOTIFY)
+    RET (IO_READNOTIFY)
+    RET (IO_READSLEEP)
+    RET (IO_SIGIO)
+    RET (IO_PATHCONF)
+    RET (IO_IDENTITY)
+    RET (IO_REVOKE)
+    case _NUMBER_OF_ROUTINES:
     default:
       return "";
     }