Use sizeof_array instead of ad-hoc calculation

diff --git a/ChangeLog b/ChangeLog
index 5f2806c902e7180aa12d76d278d8f1b707cee272..c09275107f2eee01bfee1d9844a6230d6e883dcb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-24  Guillem Jover  <guillem@debian.org>
+
+       * 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  <guillem@debian.org>
 
        * src/trigcmd.c (main): Remove duplicate program name from badusage.

diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c
index 527bebcb0d83e9cad35c33d204489f1169687c59..43991036ad1ebf5fb3121912e014837d04505f5f 100644 (file)
--- 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 7eff4b429a9e38a3eb89987f09f9e768e355f000..da8b9a72467421946d661ffa9566b3ea04314e4a 100644 (file)
--- 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];
 }