1 files changed, 18 insertions, 3 deletions
diff --git a/src/libmain.c b/src/libmain.c
index 5dce8a0..b96d0da 100644
--- a/src/libmain.c
+++ b/src/libmain.c
@@ -25,12 +25,26 @@ aplwc_destroy(struct aplwc *p)
 }
 
 const char *
+aplwc_errstr_rc(enum aplwc_rc rc)
+{
+	switch(rc){
+	case APLWC_OK:
+		return "";
+	case APLWC_OUT_OF_MEMORY:
+		return "Out of memory";
+	default:
+		return "(unable to produce error string)";
+	}
+}
+
+const char *
 aplwc_errstr(struct aplwc *aplwc)
 {
 	enum { BUF_SIZE = 256 };
 
 	static char buf[BUF_SIZE];
 	const char *err, *msg;
+	enum aplwc_rc rc;
 	char *p;
 	size_t len, i;
 
@@ -39,12 +53,13 @@ aplwc_errstr(struct aplwc *aplwc)
 	err = msg = NULL;
 
 	if(aplwc){
-		err = rc_to_string(aplwc->last_error);
 		msg = aplwc->last_error_msg;
+		rc = aplwc->last_error;
+	}else{
+		rc = APLWC_RC_LAST+1;
 	}
 	
-	if(!err)
-		err = "(unable to produce error string)";
+	err = aplwc_errstr_rc(rc);
 
 	for(i = 0, len = strlen(err); (i <= len) && (((p+i)-buf) < (BUF_SIZE-1)); i++)
 		p[i] = err[i];