Use new min and max macros instead of hardcoded tests

diff --git a/ChangeLog b/ChangeLog
index 5eeb62642514840a9fc8790dd929ceba7e9ea829..a24237dff1de8253eba97d1e5544b25589ce49cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-07-10 Guillem Jover  <guillem@debian.org>
+
+       * lib/dpkg-priv.h (min, max): New macros.
+       * lib/tarfn.c: Include <dpkg-priv.h>.
+       * src/configure.c: Likewise.
+       * src/enquiry.c: Likewise.
+
+       * src/configure.c (conffderef): Use max instead of hardcoded test.
+       * lib/tarfn.c (TarExtractor): Use min instead of hardcoded test.
+       * lib/fields.c (conffvalue_lastword): Likewise.
+       * src/enquiry.c (limiteddescription): Likewise.
+       * src/main.c (setforce): Likewise.
+       * src/query.c (limiteddescription): Likewise.
+
 2008-07-10  Guillem Jover  <guillem@debian.org>,
             Timothy G Abbott  <tabbott@mega-man.mit.edu>
 

diff --git a/lib/dpkg-priv.h b/lib/dpkg-priv.h
index 8638e6dbcd945ab73a7bafb514151eee3b941ccf..412b2bd8c9d972ecfcdefa62a9a78455a361497d 100644 (file)
--- a/lib/dpkg-priv.h
+++ b/lib/dpkg-priv.h
@@ -34,6 +34,14 @@ extern "C" {
 #define sizeof_array(a) (sizeof(a) / sizeof((a)[0]))
 #endif
 
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
+#ifndef max
+#define max(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
 /* String handling. */
 
 char *str_escape_fmt(char *dest, const char *src);

diff --git a/lib/fields.c b/lib/fields.c
index 9fc8197023c1b4ed6a7f7fc808a461b3fda77010..8c181e60615c0aca6334fda80ffea615a6882e46 100644 (file)
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -246,7 +246,7 @@ static void conffvalue_lastword(const char *value, const char *from,
 malformed:
   parse_error(filename, lno, pigp,
               _("value for `conffiles' has malformatted line `%.*s'"),
-              (int)(endent - value > 250 ? 250 : endent - value), value);
+              (int)min(endent - value, 250), value);
 }
 
 void f_conffiles(struct pkginfo *pigp, struct pkginfoperfile *pifp,

diff --git a/lib/tarfn.c b/lib/tarfn.c
index f0ed1a5624d37c45deafc977f50e076ade228a50..970039036d819fa5adf73332aa1f5bf65bb65dbf 100644 (file)
--- a/lib/tarfn.c
+++ b/lib/tarfn.c
@@ -15,6 +15,7 @@
 #include <errno.h>
 #include <tarfn.h>
 #include <dpkg.h>
+#include <dpkg-priv.h>
 
 #include "strnlen.h"
 
@@ -245,8 +246,7 @@ TarExtractor(
                      }
                      break;
                   }
-
-                   copysize = long_read > 512 ? 512 : long_read;
+                               copysize = min(long_read, 512);
                    memcpy (bp, buffer, copysize);
                    bp += copysize;
 

diff --git a/src/configure.c b/src/configure.c
index 092402090b7a71897824d14b741e4b47cc1af01f..b46e850378e2e9e9110072af0844df681392bd45 100644 (file)
--- a/src/configure.c
+++ b/src/configure.c
@@ -41,6 +41,7 @@
 
 #include <dpkg.h>
 #include <dpkg-db.h>
+#include <dpkg-priv.h>
 
 #include "filesdb.h"
 #include "main.h"
@@ -380,7 +381,7 @@ int conffderef(struct pkginfo *pkg, struct varbuf *result, const char *in) {
                                        return -1;
                                }
                                debug(dbg_conffdetail,"conffderef readlink gave %d, `%.*s'",
-                                               r, r>0 ? r : 0, linkreadbuf);
+                                               r, max(r, 0), linkreadbuf);
                                if (r < linkreadbufsize-1) break;
                                need= r<<2;
                        }

diff --git a/src/enquiry.c b/src/enquiry.c
index ff385bf86c03c93942e015b4094d503fc8345c80..fffe4e9bafd6c8444b103c2cfeb840f6522ef4da 100644 (file)
--- a/src/enquiry.c
+++ b/src/enquiry.c
@@ -36,6 +36,7 @@
 
 #include <dpkg.h>
 #include <dpkg-db.h>
+#include <dpkg-priv.h>
 #include <myopt.h>
 
 #include "filesdb.h"
@@ -56,7 +57,7 @@ static void limiteddescription(struct pkginfo *pkg, int maxl,
   if (!pdesc) pdesc= _("(no description available)");
   p= strchr(pdesc,'\n');
   if (!p) p= pdesc+strlen(pdesc);
-  l= (p - pdesc > maxl) ? maxl : (int)(p - pdesc);
+  l = min(p - pdesc, maxl);
   *pdesc_r=pdesc; *l_r=l;
 }
 

diff --git a/src/main.c b/src/main.c
index 279018007e822057465ad56548a0d39a7dfbc293..99ac6c6236120b6fc74df9fcf7d9b401b4308c9b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -36,6 +36,7 @@
 
 #include <dpkg.h>
 #include <dpkg-db.h>
+#include <dpkg-priv.h>
 #include <myopt.h>
 
 #include "main.h"
@@ -361,7 +362,7 @@ static void setforce(const struct cmdinfo *cip, const char *value) {
          if (fip->opt)
            *fip->opt= cip->arg;
       } else
-       badusage(_("unknown force/refuse option `%.*s'"), l<250 ? (int)l : 250, value);
+       badusage(_("unknown force/refuse option `%.*s'"), min(l, 250), value);
     } else {
       if (fip->opt)
        *fip->opt= cip->arg;

diff --git a/src/query.c b/src/query.c
index e6151ab5677c8fdd5f254a9f1f665ef3d2d7f931..425931922c47ad58f7f6db19d5859b3ed1d6b6fe 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -62,7 +62,7 @@ static void limiteddescription(struct pkginfo *pkg, int maxl,
   if (!pdesc) pdesc= _("(no description available)");
   p= strchr(pdesc,'\n');
   if (!p) p= pdesc+strlen(pdesc);
-  l= (p - pdesc > maxl) ? maxl : (int)(p - pdesc);
+  l = min(p - pdesc, maxl);
   *pdesc_r=pdesc; *l_r=l;
 }