From 92799db17bd75457260336876038cc18529ccb60 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 28 Aug 2004 07:10:38 +0000
Subject: [PATCH] (dodeliver): Move from sect.c to deliver.c.  No functional
 changes. (deliver): Static linkage.

---
 include/prototypes.h     |  4 +---
 src/lib/update/deliver.c | 28 +++++++++++++++++++++++++++-
 src/lib/update/sect.c    | 26 --------------------------
 3 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/include/prototypes.h b/include/prototypes.h
index d89a92f1d..a20fc5a3f 100644
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -540,8 +540,7 @@ extern void delete_old_announcements(void);
 /* bp.c */
 /* in budg.h */
 /* deliver.c */
-extern int deliver(register struct sctstr *, struct ichrstr *, int, int,
-		   int, int);
+extern void dodeliver(struct sctstr *);
 /* distribute.c */
 extern int dodistribute(struct sctstr *, int, s_char *, double, double);
 /* finish.c */
@@ -613,7 +612,6 @@ extern void guerrilla(struct sctstr *);
 /* sail.c */
 extern void sail_ship(natid);
 /* sect.c */
-extern void dodeliver(struct sctstr *);
 extern void do_fallout(register struct sctstr *, register int);
 extern void spread_fallout(struct sctstr *, int);
 extern void decay_fallout(struct sctstr *, int);
diff --git a/src/lib/update/deliver.c b/src/lib/update/deliver.c
index 25a90498c..853815f0d 100644
--- a/src/lib/update/deliver.c
+++ b/src/lib/update/deliver.c
@@ -42,7 +42,7 @@
 #include "subs.h"
 #include "common.h"
 
-int
+static int
 deliver(register struct sctstr *from, struct ichrstr *ip, int dir,
 	int thresh, int amt_src, int plague)
 {
@@ -115,3 +115,29 @@ deliver(register struct sctstr *from, struct ichrstr *ip, int dir,
     from->sct_mobil = n;
     return amt_moved;
 }
+
+void
+dodeliver(struct sctstr *sp)
+{
+    register int i;
+    int thresh;
+    int dir;
+    int plague;
+    int n;
+
+    if (sp->sct_mobil <= 0)
+	return;
+    plague = sp->sct_pstage;
+    for (i = 1; i <= I_MAX; i++) {
+	if (sp->sct_del[i] == 0)
+	    continue;
+	thresh = sp->sct_del[i] & ~0x7;
+	dir = sp->sct_del[i] & 0x7;
+	n = deliver(sp, &ichr[i], dir, thresh, sp->sct_item[i], plague);
+	if (n > 0) {
+	    sp->sct_item[i] -= n;
+	    if (sp->sct_mobil <= 0)
+		break;
+	}
+    }
+}
diff --git a/src/lib/update/sect.c b/src/lib/update/sect.c
index 6b7c027f7..cdace40f6 100644
--- a/src/lib/update/sect.c
+++ b/src/lib/update/sect.c
@@ -55,32 +55,6 @@
 #include "lost.h"
 #include "gen.h"
 
-void
-dodeliver(struct sctstr *sp)
-{
-    register int i;
-    int thresh;
-    int dir;
-    int plague;
-    int n;
-
-    if (sp->sct_mobil <= 0)
-	return;
-    plague = sp->sct_pstage;
-    for (i = 1; i <= I_MAX; i++) {
-	if (sp->sct_del[i] == 0)
-	    continue;
-	thresh = sp->sct_del[i] & ~0x7;
-	dir = sp->sct_del[i] & 0x7;
-	n = deliver(sp, &ichr[i], dir, thresh, sp->sct_item[i], plague);
-	if (n > 0) {
-	    sp->sct_item[i] -= n;
-	    if (sp->sct_mobil <= 0)
-		break;
-	}
-    }
-}
-
 /*
  * Increase sector efficiency if old type == new type.
  * decrease sector efficiency if old type != new type.
-- 
2.43.0