X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=util%2Faddnote.c;h=ec15c5972a6c132024d57b0c4b48aa42cc594865;hp=741bf8a0b76cef0b5e579bd44ad6d5167e9e17f4;hb=37d30b56405bf9858e0c1c1baad93105737e7a1b;hpb=1cd0d9449cea60545406aa593c493ec90687ff6d

diff --git a/util/addnote.c b/util/addnote.c
index 741bf8a..ec15c59 100644
--- a/util/addnote.c
+++ b/util/addnote.c
@@ -105,12 +105,12 @@ main(int ac, char **av)
 
      if (ac != 2) {
 	  fprintf(stderr, "Usage: %s elf-file\n", av[0]);
-	  exit(1);
+	  return(1);
      }
      fd = open(av[1], O_RDWR);
      if (fd < 0) {
 	  perror(av[1]);
-	  exit(1);
+	  return(1);
      }
 
      nnote = 12 + ROUNDUP(strlen(arch) + 1) + sizeof(descr);
@@ -119,7 +119,7 @@ main(int ac, char **av)
      n = read(fd, buf, sizeof(buf));
      if (n < 0) {
 	  perror("read");
-	  exit(1);
+	  return(1);
      }
 
      if (n < E_HSIZE || memcmp(&buf[E_IDENT+EI_MAGIC], elf_magic, 4) != 0)
@@ -129,7 +129,7 @@ main(int ac, char **av)
 	 || buf[E_IDENT+EI_DATA] != ELFDATA2MSB) {
 	  fprintf(stderr, "%s is not a big-endian 32-bit ELF image\n",
 		  av[1]);
-	  exit(1);
+	  return(1);
      }
 
      ph = GET_32BE(E_PHOFF);
@@ -144,7 +144,7 @@ main(int ac, char **av)
 	  if (GET_32BE(ph + PH_TYPE) == PT_NOTE) {
 	       fprintf(stderr, "%s already has a note entry\n",
 		       av[1]);
-	       exit(0);
+	       return(0);
 	  }
 	  ph += ps;
      }
@@ -165,7 +165,7 @@ main(int ac, char **av)
      PUT_32BE(ns, strlen(arch) + 1);
      PUT_32BE(ns + 4, N_DESCR * 4);
      PUT_32BE(ns + 8, 0x1275);
-     strcpy(&buf[ns + 12], arch);
+     strcpy((char *)&buf[ns + 12], arch);
      ns += 12 + strlen(arch) + 1;
      for (i = 0; i < N_DESCR; ++i, ns += 4)
 	  PUT_32BE(ns, descr[i]);
@@ -180,7 +180,7 @@ main(int ac, char **av)
      PUT_32BE(ns, strlen(rpaname) + 1);
      PUT_32BE(ns + 4, sizeof(rpanote));
      PUT_32BE(ns + 8, 0x12759999);
-     strcpy(&buf[ns + 12], rpaname);
+     strcpy((char *)&buf[ns + 12], rpaname);
      ns += 12 + ROUNDUP(strlen(rpaname) + 1);
      for (i = 0; i < N_RPA_DESCR; ++i, ns += 4)
 	  PUT_32BE(ns, rpanote[i]);
@@ -193,26 +193,26 @@ main(int ac, char **av)
      i = write(fd, buf, n);
      if (i < 0) {
 	  perror("write");
-	  exit(1);
+	  return(1);
      }
      if (i < n) {
 	  fprintf(stderr, "%s: write truncated\n", av[1]);
-	  exit(1);
+	  return(1);
      }
 
-     exit(0);
+     return(0);
 
 notelf:
      fprintf(stderr, "%s does not appear to be an ELF file\n", av[1]);
-     exit(1);
+     return(1);
 
 nospace:
      fprintf(stderr, "sorry, I can't find space in %s to put the note\n",
 	     av[1]);
-     exit(1);
+     return(1);
 }
 
-/* 
+/*
  * Local variables:
  * c-file-style: "k&r"
  * c-basic-offset: 5