Consistently return a value from non-void functions.

3 files changed, 38 insertions, 1 deletions

diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo
index 8be7647be85..2f4e5c0c809 100644
--- a/cad/xcircuit/distinfo
+++ b/cad/xcircuit/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2008/01/05 20:59:00 rillig Exp $
+$NetBSD: distinfo,v 1.14 2013/03/02 18:21:39 joerg Exp $
 
 SHA1 (xcircuit-3.4.26.tgz) = cf3eda5c788376a09cca6a35ee120a3f12a08c33
 RMD160 (xcircuit-3.4.26.tgz) = fd9beb37f16670505ee9aadc394d6e722947d645
@@ -6,3 +6,5 @@ Size (xcircuit-3.4.26.tgz) = 1054942 bytes
 SHA1 (patch-aa) = 8ac2a3398cbd74ca0248737c753816dee4367f97
 SHA1 (patch-ab) = 32c3f7d2d798a5c6772eaff60c894e183eb5bca6
 SHA1 (patch-ac) = 5921bc94c2288f6d1811fe5a72f136a0ef0f25e6
+SHA1 (patch-libraries.c) = 821927852dd11834a024cb1f972874b26fe9788c
+SHA1 (patch-undo.c) = 125cabb16656a6af09f8eb37be0eff6cfc3f29ca
diff --git a/cad/xcircuit/patches/patch-libraries.c b/cad/xcircuit/patches/patch-libraries.c
new file mode 100644
index 00000000000..27ccc979ef8
--- /dev/null
+++ b/cad/xcircuit/patches/patch-libraries.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-libraries.c,v 1.1 2013/03/02 18:21:39 joerg Exp $
+
+--- libraries.c.orig	2013-03-01 15:01:58.000000000 +0000
++++ libraries.c
+@@ -189,7 +189,7 @@ short *pagetotals(int page, short mode)
+    int i;
+    short *counts, *icount, *result;
+ 
+-   if (xobjs.pagelist[page]->pageinst == NULL) return;
++   if (xobjs.pagelist[page]->pageinst == NULL) return NULL;
+ 
+    counts = (short *)malloc(xobjs.pages * sizeof(short));
+    icount = (short *)malloc(xobjs.pages * sizeof(short));
diff --git a/cad/xcircuit/patches/patch-undo.c b/cad/xcircuit/patches/patch-undo.c
new file mode 100644
index 00000000000..d9d9f22000b
--- /dev/null
+++ b/cad/xcircuit/patches/patch-undo.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-undo.c,v 1.1 2013/03/02 18:21:39 joerg Exp $
+
+--- undo.c.orig	2013-03-01 15:02:52.000000000 +0000
++++ undo.c
+@@ -532,7 +532,7 @@ short undo_one_action()
+    thisrecord = xobjs.undostack;
+    if (thisrecord == NULL) {
+       Fprintf(stderr, "Nothing to undo!\n");
+-      return;
++      return -1;
+    }
+ 
+    xobjs.undostack = thisrecord->next;
+@@ -775,7 +775,7 @@ short redo_one_action()
+    thisrecord = xobjs.redostack;
+    if (thisrecord == NULL) {
+       Fprintf(stderr, "Nothing to redo!\n");
+-      return;
++      return -1;
+    }
+    xobjs.undostack = thisrecord;
+    xobjs.redostack = thisrecord->last;