Revert "Add support for the childfdmap for Go"
authorKevin Klues <klueska@cs.berkeley.edu>
Tue, 26 Aug 2014 20:01:39 +0000 (13:01 -0700)
committerKevin Klues <klueska@cs.berkeley.edu>
Tue, 26 Aug 2014 20:01:39 +0000 (13:01 -0700)
This reverts commit 1f6c9b6de45e868d0dffd3415825273dac459695.

kern/include/ros/procinfo.h
kern/include/ros/syscall.h

index 89e0a81..e54b184 100644 (file)
@@ -100,29 +100,6 @@ procinfo_pack_args(procinfo_t* p, char* const* argv, char* const* envp)
                pos += len;
        }
        p->argp[nargv+nenvp+1] = 0;
-
-       return 0;
-}
-#ifndef STRUCT_CHILDFDMAP_DEFINED
-#define STRUCT_CHILDFDMAP_DEFINED
-struct childfdmap {
-  int parentfd;
-  int childfd;
-  int ok;
-};
-#endif
-
-// the fdlist is an map: list[childfd] ->parentfd
-static int
-childfdmap_pack(struct childfdmap *cfdmap, int *fdlist, int len)
-{
-       int i;
-
-       for (i = 0; i < len; i++) {
-               cfdmap[i].ok = -1;
-               cfdmap[i].childfd = i;
-               cfdmap[i].parentfd = fdlist[i];
-       }
        
        return 0;
 }
index 8d47c45..567f713 100644 (file)
@@ -32,15 +32,11 @@ struct syscall {
        char                                            errstr[MAX_ERRSTR_LEN];
 };
 
-// include hell with go and friends.
-#ifndef STRUCT_CHILDFDMAP_DEFINED
-#define STRUCT_CHILDFDMAP_DEFINED
 struct childfdmap {
-  int parentfd;
-  int childfd;
-  int ok;
+       unsigned int                            parentfd;
+       unsigned int                            childfd;
+       int                                                     ok;
 };
-#endif
 
 #ifndef ROS_KERNEL