Changeset 80883

Timestamp:

07/19/11 21:18:40 (4 years ago)

Author:

fotanus@…

Message:

cleanup C extension

File:

• branches/gsoc11-post-destroot/base/src/pextlib1.0/macho.c (modified) (12 diffs)

branches/gsoc11-post-destroot/base/src/pextlib1.0/macho.c

@@ -9 +9 @@
 #include <sys/mman.h>
 
-#include <err.h>
 #include <string.h>
 
@@ -30 +29 @@
 static const void *macho_read (macho_input_t *input, const void *address, size_t length) {
         if ((((uint8_t *) address) - ((uint8_t *) input->data)) + length > input->length) {
-                warnx("Short read parsing Mach-O input");
                 return NULL;
         }
@@ -120 +118 @@
 
                 default:
-                        warnx("Unknown Mach-O magic: 0x%" PRIx32 "", *magic);
-                        return false;
+                        return TCL_ERROR;
         }
 
@@ -158 +155 @@
         cmd = macho_offset(input, header, header_size, sizeof(struct load_command));
         if (cmd == NULL)
-                return false;
+                return TCL_ERROR;
         ncmds = swap32(header->ncmds);
 
@@ -167 +164 @@
                 cmd = macho_read(input, cmd, cmdsize);
                 if (cmd == NULL)
-                        return false;
+                        return TCL_ERROR;
 
                 /* Handle known types */
@@ -175 +172 @@
                                 /* Fetch the path */
                                 if (cmdsize < sizeof(struct rpath_command)) {
-                                        warnx("Incorrect cmd size");
-                                        return false;
+                                        return TCL_ERROR;
                                 }
 
@@ -182 +178 @@
                                 const void *pathptr = macho_offset(input, cmd, sizeof(struct rpath_command), pathlen);
                                 if (pathptr == NULL)
-                                        return false;
+                                        return TCL_ERROR;
 
                                 char *path = malloc(pathlen);
@@ -198 +194 @@
                                 /* Extract the install name */
                                 if (cmdsize < sizeof(struct dylib_command)) {
-                                        warnx("Incorrect name size");
-                                        return false;
+                                        return TCL_ERROR;
                                 }
 
@@ -205 +200 @@
                                 const void *nameptr = macho_offset(input, cmd, sizeof(struct dylib_command), namelen);
                                 if (nameptr == NULL)
-                                        return false;
+                                        return TCL_ERROR;
 
                                 char *name = malloc(namelen);
@@ -286 +281 @@
 
                 default:
-                        warnx("Unknown Mach-O magic: 0x%" PRIx32 "", *magic);
                         return TCL_ERROR;
         }
@@ -354 +348 @@
         void *data = mmap(NULL, stbuf.st_size, PROT_READ, MAP_FILE|MAP_PRIVATE, fd, 0);
         if (data == MAP_FAILED)
-                err(1, "mmap()");
+                return TCL_ERROR;
 
         /* Parse */
@@ -394 +388 @@
         void *data = mmap(NULL, stbuf.st_size, PROT_READ, MAP_FILE|MAP_PRIVATE, fd, 0);
         if (data == MAP_FAILED)
-                err(1, "mmap()");
+                return TCL_ERROR;
 
         /* Parse */