From: Guillem Jover <guillem@debian.org>
Date: Sat, 24 May 2008 05:46:24 +0000 (+0300)
Subject: Use sizeof_array instead of ad-hoc calculation
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f82df02606c0ebb07dcd8646fe201f724b3b8479;p=dpkg

Use sizeof_array instead of ad-hoc calculation
---

diff --git a/ChangeLog b/ChangeLog
index 5f2806c9..c0927510 100644
--- 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 527bebcb..43991036 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 7eff4b42..da8b9a72 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];
 }