Doxygen annotations.

CVS patchset: 4133
CVS date: 2000/08/27 19:40:35

diff --git a/lib/hash.c b/lib/hash.c
index 73f37a2..a8c67ac 100644 (file)
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -1,4 +1,5 @@
-/** \file lib/hash.c
+/**
+ * \file lib/hash.c
  * Hash table implemenation
  */
 

diff --git a/lib/transaction.c b/lib/transaction.c
index c7743c6..9f3a5f1 100644 (file)
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -1,3 +1,7 @@
+/** \ingroup rpmtrans
+ * \file lib/transaction.c
+ */
+
 #include "system.h"
 
 #include <rpmlib.h>
@@ -194,20 +198,25 @@ static void psAppendFile(rpmProblemSet probs, rpmProblemType type,
 
 static int archOkay(Header h)
 {
-    int_8 * pkgArchNum;
     void * pkgArch;
-    int type, count, archNum;
+    int type, count;
 
     /* make sure we're trying to install this on the proper architecture */
     headerGetEntry(h, RPMTAG_ARCH, &type, (void **) &pkgArch, &count);
+#ifndef        DYING
     if (type == RPM_INT8_TYPE) {
+       int_8 * pkgArchNum;
+       int archNum;
+
        /* old arch handling */
        rpmGetArchInfo(NULL, &archNum);
        pkgArchNum = pkgArch;
        if (archNum != *pkgArchNum) {
            return 0;
        }
-    } else {
+    } else
+#endif
+    {
        /* new arch handling */
        if (!rpmMachineScore(RPM_MACHTABLE_INSTARCH, pkgArch)) {
            return 0;
@@ -224,11 +233,14 @@ static int osOkay(Header h)
 
     /* make sure we're trying to install this on the proper os */
     headerGetEntry(h, RPMTAG_OS, &type, (void **) &pkgOs, &count);
+#ifndef        DYING
     if (type == RPM_INT8_TYPE) {
        /* v1 packages and v2 packages both used improper OS numbers, so just
           deal with it hope things work */
        return 1;
-    } else {
+    } else
+#endif
+    {
        /* new os handling */
        if (!rpmMachineScore(RPM_MACHTABLE_INSTOS, pkgOs)) {
            return 0;

diff --git a/popt/findme.c b/popt/findme.c
index 8518be1..b5878a1 100644 (file)
--- a/popt/findme.c
+++ b/popt/findme.c
@@ -1,3 +1,7 @@
+/** \ingroup popt
+ * \file popt/findme.c
+ */
+
 /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
    ftp://ftp.redhat.com/pub/code/popt */

diff --git a/popt/findme.h b/popt/findme.h
index 5e93963..78f714e 100644 (file)
--- a/popt/findme.h
+++ b/popt/findme.h
@@ -1,3 +1,7 @@
+/** \ingroup popt
+ * \file popt/findme.h
+ */
+
 /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
    ftp://ftp.redhat.com/pub/code/popt */

diff --git a/popt/po/popt.pot b/popt/po/popt.pot
index e5aae73..a8101ef 100644 (file)
--- a/popt/po/popt.pot
+++ b/popt/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-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"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr ""

diff --git a/popt/popt.c b/popt/popt.c
index 4979ed5..0726c32 100644 (file)
--- a/popt/popt.c
+++ b/popt/popt.c
@@ -1,3 +1,7 @@
+/** \ingroup popt
+ * \file popt/popt.c
+ */
+
 /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from
    ftp://ftp.redhat.com/pub/code/popt */

diff --git a/popt/popt.h b/popt/popt.h
index 2209f38..b6e1f6b 100644 (file)
--- a/popt/popt.h
+++ b/popt/popt.h
@@ -1,3 +1,7 @@
+/** \ingroup popt
+ * \file popt/popt.h
+ */
+
 /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
    ftp://ftp.redhat.com/pub/code/popt */

diff --git a/popt/poptconfig.c b/popt/poptconfig.c
index 7a1a4c2..9e50b52 100644 (file)
--- a/popt/poptconfig.c
+++ b/popt/poptconfig.c
@@ -1,3 +1,7 @@
+/** \ingroup popt
+ * \file popt/poptconfig.c
+ */
+
 /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
    ftp://ftp.redhat.com/pub/code/popt */

diff --git a/popt/popthelp.c b/popt/popthelp.c
index c36ecea..8eed7ee 100644 (file)
--- a/popt/popthelp.c
+++ b/popt/popthelp.c
@@ -1,5 +1,9 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 
+/** \ingroup popt
+ * \file popt/popthelp.c
+ */
+
 /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
    ftp://ftp.redhat.com/pub/code/popt */

diff --git a/popt/poptint.h b/popt/poptint.h
index a1edb97..39ae3ee 100644 (file)
--- a/popt/poptint.h
+++ b/popt/poptint.h
@@ -1,3 +1,7 @@
+/** \ingroup popt
+ * \file popt/poptint.h
+ */
+
 /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
    ftp://ftp.redhat.com/pub/code/popt */

diff --git a/popt/poptparse.c b/popt/poptparse.c
index 7c9f06b..7a2d505 100644 (file)
--- a/popt/poptparse.c
+++ b/popt/poptparse.c
@@ -1,3 +1,7 @@
+/** \ingroup popt
+ * \file popt/poptparse.c
+ */
+
 /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
    ftp://ftp.redhat.com/pub/code/popt */