[Fastboot] [patch 08/14] kexec-tools: Use die() instead of err()

[Horms]

Instead of defining a specialised err() function to exit with
non-standard error codes, just use the global die() function.

Signed-off-by: Simon Horman <[EMAIL PROTECTED]>

Index: kexec-tools-testing/kexec/arch/ppc64/fs2dt.c
===================================================================
--- kexec-tools-testing.orig/kexec/arch/ppc64/fs2dt.c   2006-12-08 
17:08:44.000000000 +0900
+++ kexec-tools-testing/kexec/arch/ppc64/fs2dt.c        2006-12-08 
17:28:28.000000000 +0900
@@ -37,26 +37,6 @@
 #define TREEWORDS 65536                /* max 32 bit words for property values 
*/
 #define MEMRESERVE 256         /* max number of reserved memory blocks */
 
-enum {
-       ERR_NONE,
-       ERR_USAGE,
-       ERR_OPENDIR,
-       ERR_READDIR,
-       ERR_STAT,
-       ERR_OPEN,
-       ERR_READ,
-       ERR_RESERVE,
-};
-
-static void err(const char *str, int rc)
-{
-       if (errno)
-               perror(str);
-       else
-               fprintf(stderr, "%s: unrecoverable error\n", str);
-       exit(rc);
-}
-
 static char pathname[MAXPATH], *pathstart;
 static char propnames[NAMESPACE] = { 0 };
 static unsigned dtstruct[TREEWORDS], *dt;
@@ -78,7 +58,7 @@
                ;
 
        if (offset + 4 >= 2 * MEMRESERVE)
-               err("exhasuted reservation meta data", ERR_RESERVE);
+               die("unrecoverable error: exhasuted reservation meta data\n");
 
        mem_rsrv[offset] = where;
        mem_rsrv[offset + 1] = length;
@@ -91,7 +71,7 @@
        static unsigned long long base, size;
 
        if ((data == NULL) && (base || size))
-                       err((void *)data, ERR_RESERVE);
+               die("unrecoverable error: no property data");
        else if (!strcmp(name, "linux,rtas-base"))
                base = *data;
        else if (!strcmp(name, "linux,tce-base"))
@@ -148,7 +128,8 @@
 
        lseek(fd, 0, SEEK_SET);
        if (read(fd, buf, len) != len)
-               err(pathname, ERR_READ);
+               die("unrecoverable error: error reading \"%s\": %s\n",
+                   pathname, strerror(errno));
 
        base = ((unsigned long long *)buf)[0];
        end = base + ((unsigned long long *)buf)[1];
@@ -207,7 +188,8 @@
                         continue;
 
                if (lstat(pathname, &statbuf))
-                       err(pathname, ERR_STAT);
+                       die("unrecoverable error: could not stat \"%s\": %s\n",
+                           pathname, strerror(errno));
 
                if (!crash_param && !strcmp(fn,"linux,crashkernel-base"))
                        continue;
@@ -247,10 +229,12 @@
 
                fd = open(pathname, O_RDONLY);
                if (fd == -1)
-                       err(pathname, ERR_OPEN);
+                       die("unrecoverable error: could not open \"%s\": %s\n",
+                           pathname, strerror(errno));
 
                if (read(fd, dt, len) != len)
-                       err(pathname, ERR_READ);
+                       die("unrecoverable error: could not read \"%s\": %s\n",
+                           pathname, strerror(errno));
 
                checkprop(fn, dt);
 
@@ -296,7 +280,7 @@
        if(errno == ENOSYS)
                errno = 0;
        if (errno)
-               err(pathname, ERR_READDIR);
+               die("inrecoverable error: XXX: %s\n", strerror(errno));
        checkprop(pathname, NULL);
 }
 
@@ -344,7 +328,8 @@
 
        numlist = scandir(pathname, &namelist, 0, comparefunc);
        if (numlist == 0)
-               err(pathname, ERR_OPENDIR);
+               die("unrecoverable error: could not scan \"%s\": %s\n",
+                   pathname, strerror(errno));
 
        basename = strrchr(pathname,'/');
 
@@ -393,13 +378,14 @@
                        continue;
 
                if (lstat(pathname, &statbuf))
-                       err(pathname, ERR_STAT);
+                       die("unrecoverable error: could not stat \"%s\": %s\n",
+                           pathname, strerror(errno));
 
                if (S_ISDIR(statbuf.st_mode))
                        putnode();
        }
        if (errno)
-               err(pathname, ERR_READDIR);
+               die("unrecoverable error: XXX %s\n", strerror(errno));
 
        *dt++ = 2;
        dn[-1] = '\0';

--

-- 
Horms
  H: http://www.vergenet.net/~horms/
  W: http://www.valinux.co.jp/en/

_______________________________________________
fastboot mailing list
fastboot@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/fastboot