Fixed the gcc4 warning reported in PR 33883 and another similar one. One

of them was a real bug (missing initialization of a structure; luckily
not introduced by me), the other was a false positive.

3 files changed, 24 insertions, 10 deletions

diff --git a/devel/cqual/distinfo b/devel/cqual/distinfo
index 410a64396ec..3e56aff5054 100644
--- a/devel/cqual/distinfo
+++ b/devel/cqual/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2006/06/29 10:58:26 rillig Exp $
+$NetBSD: distinfo,v 1.7 2006/07/01 09:12:52 rillig Exp $
 
 SHA1 (cqual-0.991.tar.gz) = f559af6947465ca242f19c1f499c7cb004e713e4
 RMD160 (cqual-0.991.tar.gz) = e3837a11c75f750196ec4be7f991ec519c1260f6
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = d1477b709c9b3569fe4fa4e3e0afc1f8314892c2
 SHA1 (patch-ab) = 5ededa6979542cb83c53abd38fe9923495562a99
 SHA1 (patch-ac) = 0aee16d388ff2d40ca176c0f313505d83ee3aa52
 SHA1 (patch-ba) = 316aae97a0031bbe229baaa0519ad25a2b901663
-SHA1 (patch-bb) = 517c9d0a151e6d501c3ea49b0d612e75a09fc1db
+SHA1 (patch-bb) = ef08b433f1f0bec808d2536e322f7c1dc14c9142
 SHA1 (patch-bc) = 5b37902e672fe28156908a98df69e0630e9c9738
 SHA1 (patch-bd) = 1d434fac7ca549e2b0e0e12d191c5846e66bedf5
 SHA1 (patch-be) = 0a1a9bd41f57805da84922538fe2c42d84fd33f0
@@ -16,7 +16,7 @@ SHA1 (patch-bg) = 4b53d4caac2c24a98e8acbc054877256c6ddebac
 SHA1 (patch-bh) = b4e05070ced650b4dea42620e2ebb78eabf743ee
 SHA1 (patch-bi) = 7997cb5b9f5f8b51bf382ae18cf355a74a7c3624
 SHA1 (patch-bj) = 66c4c93fe18841db68ccdc2bb8e4d22a06abd731
-SHA1 (patch-bk) = 240ad47d74c397b94eb9955fa903542fa7407d95
+SHA1 (patch-bk) = ecec2dfb2b57e8b2632da6ef6e53523e9e423788
 SHA1 (patch-bl) = 70fe692644529a38bdaefbff67a264db9179e5f7
 SHA1 (patch-bm) = eb57badc6c4530243aeeeb14aba4418d77ea453c
 SHA1 (patch-ca) = fb4806cfb3c2347fe5089f42e419c57bec7e2432
diff --git a/devel/cqual/patches/patch-bb b/devel/cqual/patches/patch-bb
index f9790523197..a59d00039f4 100644
--- a/devel/cqual/patches/patch-bb
+++ b/devel/cqual/patches/patch-bb
@@ -1,9 +1,12 @@
-$NetBSD: patch-bb,v 1.1 2006/01/18 23:24:12 rillig Exp $
+$NetBSD: patch-bb,v 1.2 2006/07/01 09:12:52 rillig Exp $
 
-SunPro says: void functions cannot return a value.
+SunPro cannot handle "extern inline" functions.
+
+It is more portable to use explicit assignment instead of {foo=bar},
+especially since the initializers are not constant.
 
 --- src/common-analyze.c.orig	2003-09-27 23:35:48.000000000 +0200
-+++ src/common-analyze.c	2006-01-16 14:41:27.006921000 +0100
++++ src/common-analyze.c	2006-07-01 10:32:58.000000000 +0200
 @@ -36,11 +36,11 @@ effect global_effect = NULL; /* Effect c
  				       of every function */
  effect global_env = NULL;    /* Locations bound in global scope */
@@ -18,7 +21,7 @@ SunPro says: void functions cannot return a value.
  { 
    mkleq_effect(e, global_effect); 
  }
-@@ -492,21 +492,30 @@ void mkNonConst_aggregate(location loc, 
+@@ -492,21 +492,31 @@ void mkNonConst_aggregate(location loc, 
   *                                                                        *
   **************************************************************************/
  
@@ -52,10 +55,11 @@ SunPro says: void functions cannot return a value.
 +
 +  result.eff = eff;
 +  result.alocs = alocs;
++  result.drinfolist = NULL;
    return result;
  }
  
-@@ -550,7 +559,7 @@ struct operator operators[] =
+@@ -550,7 +560,7 @@ struct operator operators[] =
      {0, 0, NULL}};
  
  /* Given an operator function name, return its signature */
diff --git a/devel/cqual/patches/patch-bk b/devel/cqual/patches/patch-bk
index e494b23b7b5..3807643ba17 100644
--- a/devel/cqual/patches/patch-bk
+++ b/devel/cqual/patches/patch-bk
@@ -1,9 +1,9 @@
-$NetBSD: patch-bk,v 1.2 2006/06/29 10:58:26 rillig Exp $
+$NetBSD: patch-bk,v 1.3 2006/07/01 09:12:52 rillig Exp $
 
 SunPro cannot handle direct initialization of structures.
 
 --- src/rinf_analyze.c.orig	2003-09-06 02:50:16.000000000 +0200
-+++ src/rinf_analyze.c	2006-06-29 12:54:43.000000000 +0200
++++ src/rinf_analyze.c	2006-07-01 10:49:07.000000000 +0200
 @@ -29,7 +29,7 @@ Boston, MA 02111-1307, USA. */
  static effecttype global_effect = NULL;
  static effecttype global_env = NULL;
@@ -44,3 +44,13 @@ SunPro cannot handle direct initialization of structures.
    return result;
  }
  
+@@ -865,6 +873,9 @@ static einfo analyze_expression(expressi
+       expression e2;
+       effecttype eff;
+ 
++      /* shut up gcc4 warning about use of uninitialized value */
++      result.tau = NULL;
++
+       eff = effecttype_empty;
+       scan_expression (e2, c->arg1)
+ 	{