HPUX cc compiler fidgets.

CVS patchset: 3355 CVS date: 1999/09/30 16:56:05
1999-09-30 16:56:05 +00:00 · 1999-09-30 16:56:05 +00:00 · ff642c3a5e
parent 5b7c1963eb
commit ff642c3a5e
6 changed files with 69 additions and 59 deletions
--- a/build.c
+++ b/build.c
@ -296,41 +296,44 @@ static int useCatalog = 0;

 static void buildArgCallback(poptContext con, enum poptCallbackReason reason,
                             const struct poptOption * opt, const char * arg,
-                             struct rpmBuildArguments * data)
+                             const void * data)
 {
+    struct rpmBuildArguments * rba = (struct rpmBuildArguments *) data;
+
    switch (opt->val) {
-    case POPT_USECATALOG: data->useCatalog = 1; break;
-    case POPT_NOBUILD: data->noBuild = 1; break;
-    case POPT_NOLANG: data->noLang = 1; break;
-    case POPT_SHORTCIRCUIT: data->shortCircuit = 1; break;
-    case POPT_RMSOURCE: data->buildAmount |= RPMBUILD_RMSOURCE; break;
-    case POPT_RMSPEC: data->buildAmount |= RPMBUILD_RMSPEC; break;
-    case POPT_RMBUILD: data->buildAmount |= RPMBUILD_RMBUILD; break;
+    case POPT_USECATALOG: rba->useCatalog = 1; break;
+    case POPT_NOBUILD: rba->noBuild = 1; break;
+    case POPT_NOLANG: rba->noLang = 1; break;
+    case POPT_SHORTCIRCUIT: rba->shortCircuit = 1; break;
+    case POPT_RMSOURCE: rba->buildAmount |= RPMBUILD_RMSOURCE; break;
+    case POPT_RMSPEC: rba->buildAmount |= RPMBUILD_RMSPEC; break;
+    case POPT_RMBUILD: rba->buildAmount |= RPMBUILD_RMBUILD; break;
    case POPT_BUILDROOT:
-	if (data->buildRootOverride) {
+	if (rba->buildRootOverride) {
 	    fprintf(stderr, _("buildroot already specified"));
 	    exit(EXIT_FAILURE);
+	    /*@notreached@*/
 	}
-	data->buildRootOverride = xstrdup(arg);
+	rba->buildRootOverride = xstrdup(arg);
 	break;
    case POPT_BUILDARCH:
 	fprintf(stderr, _("--buildarch has been obsoleted.  Use the --target option instead.\n")); 
 	exit(EXIT_FAILURE);
-	break;
+	/*@notreached@*/ break;
    case POPT_BUILDOS:
 	fprintf(stderr, _("--buildos has been obsoleted.  Use the --target option instead.\n")); 
 	exit(EXIT_FAILURE);
-	break;
+	/*@notreached@*/ break;
    case POPT_TARGETPLATFORM:
-	if (data->targets) {
-	    int len = strlen(data->targets) + strlen(arg) + 2;
-	    data->targets = xrealloc(data->targets, len);
-	    strcat(data->targets, ",");
+	if (rba->targets) {
+	    int len = strlen(rba->targets) + strlen(arg) + 2;
+	    rba->targets = xrealloc(rba->targets, len);
+	    strcat(rba->targets, ",");
 	} else {
-	    data->targets = xmalloc(strlen(arg) + 1);
-	    data->targets[0] = '\0';
+	    rba->targets = xmalloc(strlen(arg) + 1);
+	    rba->targets[0] = '\0';
 	}
-	strcat(data->targets, arg);
+	strcat(rba->targets, arg);
 	break;
    }
 }
--- a/build/buildio.h
+++ b/build/buildio.h
@ -7,7 +7,7 @@

 typedef struct cpioSourceArchive {
    CFD_t	cpioCfd;
-    int		cpioArchiveSize;
+    unsigned int cpioArchiveSize;
    FD_t	cpioFdIn;
    /*@only@*/struct cpioFileMapping *cpioList;
    int		cpioCount;
--- a/lib/query.c
+++ b/lib/query.c
@ -657,8 +657,9 @@ int rpmQuery(QVA_t *qva, enum rpmQVSources source, const char * arg)
 /* ========== Query/Verify source popt args */
 static void rpmQVSourceArgCallback(/*@unused@*/poptContext con, /*@unused@*/enum poptCallbackReason reason,
 			     const struct poptOption * opt, /*@unused@*/const char * arg, 
-			     QVA_t *qva)
+			     const void * data)
 {
+    QVA_t *qva = (QVA_t *) data;

    switch (opt->val) {
      case 'a': qva->qva_source |= RPMQV_ALL; qva->qva_sourceCount++; break;
@ -710,8 +711,10 @@ struct poptOption rpmQVSourcePoptTable[] = {

 static void queryArgCallback(/*@unused@*/poptContext con, /*@unused@*/enum poptCallbackReason reason,
 			     const struct poptOption * opt, const char * arg, 
-			     QVA_t *qva)
+			     const void * data)
 {
+    QVA_t *qva = (QVA_t *) data;
+
    switch (opt->val) {
      case 'c': qva->qva_flags |= QUERY_FOR_CONFIG | QUERY_FOR_LIST; break;
      case 'd': qva->qva_flags |= QUERY_FOR_DOCS | QUERY_FOR_LIST; break;
--- a/lib/verify.c
+++ b/lib/verify.c
@ -21,8 +21,10 @@ static union _endian { int i; char b[4]; } *_endian = (union _endian *)&_ie;
 /* ========== Verify specific popt args */
 static void verifyArgCallback(/*@unused@*/poptContext con,
 	/*@unused@*/enum poptCallbackReason reason,
-	const struct poptOption * opt, /*@unused@*/const char * arg, QVA_t *qva)
+	const struct poptOption * opt, /*@unused@*/const char * arg,
+	const void * data)
 {
+    QVA_t *qva = (QVA_t *) data;
    switch (opt->val) {
      case POPT_NOFILES: qva->qva_flags |= VERIFY_FILES; break;
    }
--- a/po/rpm.pot
+++ b/po/rpm.pot
@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-09-29 19:30-0400\n"
+"POT-Creation-Date: 1999-09-30 12:36-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -65,59 +65,59 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""

-#: build.c:311
+#: build.c:313
 msgid "buildroot already specified"
 msgstr ""

-#: build.c:317
+#: build.c:320
 msgid "--buildarch has been obsoleted.  Use the --target option instead.\n"
 msgstr ""

-#: build.c:321
+#: build.c:324
 msgid "--buildos has been obsoleted.  Use the --target option instead.\n"
 msgstr ""

-#: build.c:342
+#: build.c:345
 msgid "override build architecture"
 msgstr ""

-#: build.c:344
+#: build.c:347
 msgid "override build operating system"
 msgstr ""

-#: build.c:346
+#: build.c:349
 msgid "override build root"
 msgstr ""

-#: build.c:348 rpm.c:457
+#: build.c:351 rpm.c:457
 msgid "remove build tree when done"
 msgstr ""

-#: build.c:350
+#: build.c:353
 msgid "do not execute any stages of the build"
 msgstr ""

-#: build.c:352
+#: build.c:355
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""

-#: build.c:354
+#: build.c:357
 msgid "remove sources when done"
 msgstr ""

-#: build.c:356
+#: build.c:359
 msgid "remove specfile when done"
 msgstr ""

-#: build.c:358 rpm.c:455
+#: build.c:361 rpm.c:455
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""

-#: build.c:360
+#: build.c:363
 msgid "override target platform"
 msgstr ""

-#: build.c:362
+#: build.c:365
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""

@ -2658,63 +2658,63 @@ msgstr ""
 msgid "rpmQuery: rpmdbOpen() failed\n"
 msgstr ""

-#: lib/query.c:691
+#: lib/query.c:692
 msgid "query package owning file"
 msgstr ""

-#: lib/query.c:693
+#: lib/query.c:694
 msgid "query packages in group"
 msgstr ""

-#: lib/query.c:695
+#: lib/query.c:696
 msgid "query a package file"
 msgstr ""

-#: lib/query.c:699
+#: lib/query.c:700
 msgid "query a spec file"
 msgstr ""

-#: lib/query.c:701
+#: lib/query.c:702
 msgid "query the pacakges triggered by the package"
 msgstr ""

-#: lib/query.c:703
+#: lib/query.c:704
 msgid "query the packages which require a capability"
 msgstr ""

-#: lib/query.c:705
+#: lib/query.c:706
 msgid "query the packages which provide a capability"
 msgstr ""

-#: lib/query.c:742
+#: lib/query.c:745
 msgid "list all configuration files"
 msgstr ""

-#: lib/query.c:744
+#: lib/query.c:747
 msgid "list all documentation files"
 msgstr ""

-#: lib/query.c:746
+#: lib/query.c:749
 msgid "dump basic file information"
 msgstr ""

-#: lib/query.c:748
+#: lib/query.c:751
 msgid "list files in package"
 msgstr ""

-#: lib/query.c:752
+#: lib/query.c:755
 msgid "use the following query format"
 msgstr ""

-#: lib/query.c:754
+#: lib/query.c:757
 msgid "substitute i18n sections from the following catalogue"
 msgstr ""

-#: lib/query.c:757
+#: lib/query.c:760
 msgid "display the states of the listed files"
 msgstr ""

-#: lib/query.c:759
+#: lib/query.c:762
 msgid "display a verbose file listing"
 msgstr ""

@ -3366,28 +3366,28 @@ msgstr ""
 msgid "failed to create %s\n"
 msgstr ""

-#: lib/verify.c:36
+#: lib/verify.c:38
 msgid "don't verify files in package"
 msgstr ""

-#: lib/verify.c:206
+#: lib/verify.c:208
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""

-#: lib/verify.c:224
+#: lib/verify.c:226
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""

-#: lib/verify.c:257
+#: lib/verify.c:259
 #, c-format
 msgid "missing    %s\n"
 msgstr ""

-#: lib/verify.c:319
+#: lib/verify.c:321
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""

-#: lib/verify.c:367
+#: lib/verify.c:369
 msgid "rpmVerify: rpmdbOpen() failed\n"
 msgstr ""
--- a/system.h
+++ b/system.h
@ -251,6 +251,8 @@ char *__progname;
 # undef textdomain
 # define textdomain(Domain) /* empty */
 # define _(Text) Text
+# undef dgettext
+# define dgettext(DomainName, Text) Text
 #endif

 #define N_(Text) Text