[pkgsrc/trunk]: pkgsrc/audio/libopendaap Convert some C99-isms to C89 to make...

[kristerw <kristerw%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7705276e65a9
branches:  trunk
changeset: 478901:7705276e65a9
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Sun Aug 01 16:13:32 2004 +0000

description:
Convert some C99-isms to C89 to make this build with gcc 2.95.

diffstat:

 audio/libopendaap/distinfo         |   6 +++++-
 audio/libopendaap/patches/patch-aa |  31 +++++++++++++++++++++++++++++++
 audio/libopendaap/patches/patch-ab |  29 +++++++++++++++++++++++++++++
 audio/libopendaap/patches/patch-ac |  21 +++++++++++++++++++++
 audio/libopendaap/patches/patch-ad |  16 ++++++++++++++++
 5 files changed, 102 insertions(+), 1 deletions(-)

diffs (126 lines):

diff -r dd63a13a4619 -r 7705276e65a9 audio/libopendaap/distinfo
--- a/audio/libopendaap/distinfo        Sun Aug 01 14:54:04 2004 +0000
+++ b/audio/libopendaap/distinfo        Sun Aug 01 16:13:32 2004 +0000
@@ -1,4 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/06/06 08:02:49 agc Exp $
+$NetBSD: distinfo,v 1.2 2004/08/01 16:13:32 kristerw Exp $
 
 SHA1 (libopendaap-0.2.1.tar.bz2) = 9e5d143087f7f5366250b47ba3444fa3ed46794d
 Size (libopendaap-0.2.1.tar.bz2) = 325586 bytes
+SHA1 (patch-aa) = 360e6173f943fe6283bc28b2ad9e5acd76041899
+SHA1 (patch-ab) = 44c6228eade8122da02972f6f73e34423457ded0
+SHA1 (patch-ac) = 0dbca4ad085ffe81bf707b97bbc77408faa9c6ca
+SHA1 (patch-ad) = 87735f1d47ddb9aa53a4220675060a31979cb771
diff -r dd63a13a4619 -r 7705276e65a9 audio/libopendaap/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libopendaap/patches/patch-aa        Sun Aug 01 16:13:32 2004 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.1 2004/08/01 16:13:32 kristerw Exp $
+
+--- mDNS/mDNS.c.orig   Sun Aug  1 18:03:05 2004
++++ mDNS/mDNS.c        Sun Aug  1 18:04:13 2004
+@@ -5410,12 +5410,12 @@
+ 
+       for (i = 0; i < totalrecords && ptr && ptr < end; i++)
+               {
++              char buf[1000];
+               LargeCacheRecord pkt;
+               const mDNSu8 RecordType = (mDNSu8)((i < response->h.numAnswers) ? kDNSRecordTypePacketAns : kDNSRecordTypePacketAdd);
+               ptr = GetLargeResourceRecord(m, response, ptr, end, InterfaceID, RecordType, &pkt);
+               if (!ptr) break;                // Break out of the loop and clean up our CacheFlushRecords list before exiting
+ 
+-                char buf[1000];
+                 ConvertDomainNameToCString(&pkt.r.resrec.name, buf);
+                 verbosedebugf("%s\n", buf);
+               // 1. Check that this packet resource record does not conflict with any of ours
+@@ -5500,9 +5500,10 @@
+               // 2. See if we want to add this packet resource record to our cache
+               if (m->rrcache_size)    // Only try to cache answers if we have a cache to put them in
+                       {
+-                verbosedebugf("caching\n");
+-                      mDNSu32 slot = HashSlot(&pkt.r.resrec.name);
++                      mDNSu32 slot;
+                       CacheRecord *rr;
++                verbosedebugf("caching\n");
++                      slot = HashSlot(&pkt.r.resrec.name);
+                       // 2a. Check if this packet resource record is already in our cache
+                       for (rr = m->rrcache_hash[slot]; rr; rr=rr->next)
+                               {
diff -r dd63a13a4619 -r 7705276e65a9 audio/libopendaap/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libopendaap/patches/patch-ab        Sun Aug 01 16:13:32 2004 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-ab,v 1.1 2004/08/01 16:13:32 kristerw Exp $
+
+--- discover.c.orig    Sun Aug  1 18:05:09 2004
++++ discover.c Sun Aug  1 18:06:16 2004
+@@ -89,9 +89,10 @@
+     {
+         domainlabel name;
+         domainname type, domain;
++      SDiscover_HostList *new;
+         pthread_mutex_lock(&pDiscover->mtObjectLock);
+ 
+-        SDiscover_HostList *new = malloc(sizeof(SDiscover_HostList));
++        new = malloc(sizeof(SDiscover_HostList));
+         memset(new, 0, sizeof(SDiscover_HostList));
+ 
+         new->next = pDiscover->prenamed;
+@@ -193,11 +194,10 @@
+     SDiscover *pDiscover = (SDiscover *)pvDiscoverThis;
+     SDiscover_HostList *cur, *next;
+     int cmd;
++    int finalized = 0;
+ 
+     pthread_mutex_lock(&pDiscover->mtWorkerLock);
+     pthread_mutex_lock(&pDiscover->mtObjectLock);
+-
+-    int finalized = 0;
+ 
+     cur = pDiscover->prenamed;
+     pDiscover->prenamed = NULL;
diff -r dd63a13a4619 -r 7705276e65a9 audio/libopendaap/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libopendaap/patches/patch-ac        Sun Aug 01 16:13:32 2004 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.1 2004/08/01 16:13:32 kristerw Exp $
+
+--- dmap_generics.c.orig       Sun Aug  1 18:06:33 2004
++++ dmap_generics.c    Sun Aug  1 18:07:00 2004
+@@ -144,6 +144,7 @@
+     dmapGenericContainer *gc = (dmapGenericContainer*)scopeData;
+     const dmap_ContentCode *cc;
+     dmap_DataTypes type = DMAP_DATATYPE_INVALID;
++    dmapGenericItem *newItem;
+ 
+     if ((cc = dmap_lookupCodeFromFOURCC(&dmap_table, code)))
+     {
+@@ -163,7 +164,7 @@
+         return;
+     }
+ 
+-    dmapGenericItem *newItem = malloc(sizeof(dmapGenericItem));
++    newItem = malloc(sizeof(dmapGenericItem));
+     newItem->cc = code;
+     newItem->data.type = type;
+     switch(type)
diff -r dd63a13a4619 -r 7705276e65a9 audio/libopendaap/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libopendaap/patches/patch-ad        Sun Aug 01 16:13:32 2004 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1 2004/08/01 16:13:32 kristerw Exp $
+
+--- threadpool.c.orig  Sun Aug  1 18:07:35 2004
++++ threadpool.c       Sun Aug  1 18:07:55 2004
+@@ -264,9 +264,10 @@
+ void CP_ThreadPool_QueueWorkItem(CP_SThreadPool *pTPThis, CP_TPfnJob pfnCallback,
+                                  void *arg1, void *arg2)
+ {
++    CP_STPJobQueue *pTPJQNewJob;
+     pthread_mutex_lock(&pTPThis->mtJobQueueMutex);
+ 
+-    CP_STPJobQueue *pTPJQNewJob = malloc(sizeof(CP_STPJobQueue));
++    pTPJQNewJob = malloc(sizeof(CP_STPJobQueue));
+ 
+     pTPJQNewJob->fnJobCallback = pfnCallback;
+     pTPJQNewJob->arg1 = arg1;