[SCM] dpkg's main repository branch, master, updated. 1.14.19-22-g26fb964

[Guillem Jover]

The following commit has been merged in the master branch:
commit f82df02606c0ebb07dcd8646fe201f724b3b8479
Author: Guillem Jover <[EMAIL PROTECTED]>
Date:   Sat May 24 08:46:24 2008 +0300

    Use sizeof_array instead of ad-hoc calculation

diff --git a/ChangeLog b/ChangeLog
index 5f2806c..c092751 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-05-24  Guillem Jover  <[EMAIL PROTECTED]>
 
+       * dpkg-deb/main.c: Include <dpkg-priv.h>.
+       (setaction): Use sizeof_array instead of ad-hoc calculation.
+       * dpkg-split/main.c: Include <dpkg-priv.h>.
+       (setaction): Use sizeof_array instead of ad-hoc calculation.
+
+2008-05-24  Guillem Jover  <[EMAIL PROTECTED]>
+
        * src/trigcmd.c (main): Remove duplicate program name from badusage.
 
 2008-05-19  Martin Koeppe  <[EMAIL PROTECTED]>,
diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c
index 527bebc..4399103 100644
--- a/dpkg-deb/main.c
+++ b/dpkg-deb/main.c
@@ -36,6 +36,7 @@
 
 #include <dpkg.h>
 #include <dpkg-db.h>
+#include <dpkg-priv.h>
 #include <myopt.h>
 
 #include "dpkg-deb.h"
@@ -174,7 +175,7 @@ static void setaction(const struct cmdinfo *cip, const char 
*value) {
     badusage(_("conflicting actions -%c (--%s) and -%c (--%s)"),
              cip->oshort, cip->olong, cipaction->oshort, cipaction->olong);
   cipaction= cip;
-  assert((int)(cip-cmdinfos) < (int)(sizeof(dofunctions)*sizeof(dofunction*)));
+  assert((int)(cip - cmdinfos) < (int)(sizeof_array(dofunctions)));
   action= dofunctions[cip-cmdinfos];
 }
 
diff --git a/dpkg-split/main.c b/dpkg-split/main.c
index 7eff4b4..da8b9a7 100644
--- a/dpkg-split/main.c
+++ b/dpkg-split/main.c
@@ -30,6 +30,7 @@
 
 #include <dpkg.h>
 #include <dpkg-db.h>
+#include <dpkg-priv.h>
 #include <myopt.h>
 
 #include "dpkg-split.h"
@@ -152,7 +153,7 @@ static void setaction(const struct cmdinfo *cip, const char 
*value) {
     badusage(_("conflicting actions -%c (--%s) and -%c (--%s)"),
              cip->oshort, cip->olong, cipaction->oshort, cipaction->olong);
   cipaction= cip;
-  assert((int)(cip-cmdinfos) < (int)(sizeof(dofunctions)*sizeof(dofunction*)));
+  assert((int)(cip - cmdinfos) < (int)(sizeof_array(dofunctions)));
   action= dofunctions[cip-cmdinfos];
 }
 

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]