From 913e9c9e4fe8b169e40b23a19d6f47fd01bbb90e Mon Sep 17 00:00:00 2001
From: bentley <anthonyjbentley@gmail.com>
Date: Fri, 15 Jan 2010 16:29:20 -0700
Subject: [PATCH] rgblib: use errx() for error messages

---
 src/lib/library.c | 16 +++++++---------
 src/lib/main.c    | 24 +++++++-----------------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/src/lib/library.c b/src/lib/library.c
index 16dfcc12..6a4ae158 100644
--- a/src/lib/library.c
+++ b/src/lib/library.c
@@ -5,8 +5,6 @@
 #include "lib/types.h"
 #include "lib/libwrap.h"
 
-extern void fatalerror(char *s);
-
 SLONG 
 file_Length(FILE * f)
 {
@@ -90,13 +88,13 @@ lib_ReadLib0(FILE * f, SLONG size)
 			if (l == NULL) {
 				l = malloc(sizeof *l);
 				if (!l)
-					fatalerror("Out of memory");
+					errx(5, "Out of memory");
 
 				first = l;
 			} else {
 				l->pNext = malloc(sizeof *l->pNext);
 				if (!l->pNext)
-					fatalerror("Out of memory");
+					errx(5, "Out of memory");
 
 				l = l->pNext;
 			}
@@ -113,7 +111,7 @@ lib_ReadLib0(FILE * f, SLONG size)
 				    f);
 				size -= l->nByteLength;
 			} else
-				fatalerror("Out of memory");
+				errx(5, "Out of memory");
 
 			l->pNext = NULL;
 		}
@@ -149,7 +147,7 @@ lib_Read(char *filename)
 			return (r);
 		} else {
 			fclose(f);
-			fatalerror("Not a valid xLib library");
+			errx(5, "Not a valid xLib library");
 			return (NULL);
 		}
 	} else {
@@ -226,7 +224,7 @@ lib_AddReplace(sLibrary * lib, char *filename)
 		if ((module = lib_Find(lib, filename)) == NULL) {
 			module = malloc(sizeof *module);
 			if (!module)
-				fatalerror("Out of memory");
+				errx(5, "Out of memory");
 
 			module->pNext = lib;
 			lib = module;
@@ -239,7 +237,7 @@ lib_AddReplace(sLibrary * lib, char *filename)
 		strcpy(module->tName, truncname);
 		module->pData = malloc(module->nByteLength);
 		if (!module->pData)
-			fatalerror("Out of memory");
+			errx(5, "Out of memory");
 
 		fread(module->pData, sizeof(UBYTE), module->nByteLength, f);
 
@@ -279,7 +277,7 @@ lib_DeleteModule(sLibrary * lib, char *filename)
 	}
 
 	if (!found)
-		fatalerror("Module not found");
+		errx(5, "Module not found");
 	else
 		printf("Module '%s' deleted from library\n", truncname);
 
diff --git a/src/lib/main.c b/src/lib/main.c
index 430b1523..21bdcca3 100644
--- a/src/lib/main.c
+++ b/src/lib/main.c
@@ -1,7 +1,8 @@
+#include <ctype.h>
+#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 
 #include "asmotor.h"
 
@@ -13,17 +14,6 @@
 #define strcmpi	strcasecmp
 #endif
 
-/*
- * Print out an errormessage
- *
- */
-
-void 
-fatalerror(char *s)
-{
-	fprintf(stderr, "*ERROR* : %s\n", s);
-	exit(5);
-}
 /*
  * Print the usagescreen
  *
@@ -115,10 +105,10 @@ main(int argc, char *argv[])
 							    ("Extracted module '%s'\n",
 							    argv[argn]);
 						} else
-							fatalerror
-							    ("Unable to write module");
+							errx(5,
+							    "Unable to write module");
 					} else
-						fatalerror("Module not found");
+						errx(5, "Module not found");
 
 					argn += 1;
 					argc -= 1;
@@ -126,12 +116,12 @@ main(int argc, char *argv[])
 				lib_Free(lib);
 				break;
 			default:
-				fatalerror("Invalid command");
+				errx(5, "Invalid command");
 				break;
 			}
 
 		} else {
-			fatalerror("Invalid command");
+			errx(5, "Invalid command");
 		}
 	} else
 		PrintUsage();