Use sizeof_array instead of ad-hoc calculation

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.

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];
 }
 

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];
 }