Add zsub_ prefix to fields of subscription structure.

1 files changed, 10 insertions, 9 deletions

diff --git a/lib/ZSubs.c b/lib/ZSubs.c
index 8f006f5..ab313d4 100644
--- a/lib/ZSubs.c
+++ b/lib/ZSubs.c
@@ -14,10 +14,8 @@
 /* $Header$ */
 
 #ifndef lint
-static char rcsid_ZSubscriptions_c[] = "$Header$";
-#endif lint
-
-#include <zephyr/mit-copyright.h>
+static char rcsid_ZSubscriptions_c[] = "$Id$";
+#endif
 
 #include <zephyr/zephyr_internal.h>
 
@@ -62,7 +60,7 @@ static Code_t subscr_sendoff();
  */
 
 Z_Subscriptions(sublist, nitems, port, opcode, authit)
-    ZSubscription_t *sublist;
+    register ZSubscription_t *sublist;
     int nitems;
     u_short port;
     char *opcode;
@@ -78,6 +76,9 @@ Z_Subscriptions(sublist, nitems, port, opcode, authit)
 						 adjusted below */
     int size, start, numok;
 
+    if (!nitems)
+	return ZERR_NONE;
+
     list = (char **)malloc((unsigned)nitems*3*sizeof(char *));
     if (!list)
         return (ENOMEM);
@@ -109,10 +110,10 @@ Z_Subscriptions(sublist, nitems, port, opcode, authit)
 
     /* assemble subs into an array of pointers */
     for (i=0;i<nitems;i++) {
-	list[i*3] = sublist[i].class;
-	list[i*3+1] = sublist[i].classinst;
-	if (sublist[i].recipient && *sublist[i].recipient &&
-	    *sublist[i].recipient != '*')
+	list[i*3] = sublist[i].zsub_class;
+	list[i*3+1] = sublist[i].zsub_classinst;
+	if (sublist[i].zsub_recipient && *sublist[i].zsub_recipient &&
+	    *sublist[i].zsub_recipient != '*')
 	    list[i*3+2] = ZGetSender();
 	else
 	    list[i*3+2] = "";