[SCM] dpkg's main repository branch, master, updated. 1.14.23-208-g5185f2d

[Guillem Jover]

The following commit has been merged in the master branch:
commit 6c0c8c0508720deefac78597fec0563ff084eb46
Author: Guillem Jover <guil...@debian.org>
Date:   Sun Jan 4 16:54:28 2009 +0200

    libdpkg: Use MAX_CONFIG_LINE instead of MAXDIVERTFILENAME in myfileopt

diff --git a/ChangeLog b/ChangeLog
index 426467f..f6f598b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-01-04  Guillem Jover  <guil...@debian.org>
 
+       * lib/myopt.h (MAX_CONFIG_LINE): New macro.
+       * lib/myopt.c (myfileopt): Use MAX_CONFIG_LINE instead of
+       MAXDIVERTFILENAME.
+
+2009-01-04  Guillem Jover  <guil...@debian.org>
+
        * lib/dpkg.h (SHELL, SHELLENVIR): Remove unused macros.
        * src/main.h (check_libver): Remove unused prototype.
 
diff --git a/lib/myopt.c b/lib/myopt.c
index 717094a..0cf1080 100644
--- a/lib/myopt.c
+++ b/lib/myopt.c
@@ -48,7 +48,7 @@ badusage(const char *fmt, ...)
 
 void myfileopt(const char* fn, const struct cmdinfo* cmdinfos) {
   FILE* file;
-  char linebuf[MAXDIVERTFILENAME];
+  char linebuf[MAX_CONFIG_LINE];
 
   file= fopen(fn, "r");
   if (!file) {
diff --git a/lib/myopt.h b/lib/myopt.h
index 29f300e..9c3dfee 100644
--- a/lib/myopt.h
+++ b/lib/myopt.h
@@ -42,6 +42,8 @@ struct cmdinfo {
 
 void badusage(const char *fmt, ...) NONRETURNING PRINTFFORMAT(1, 2);
 
+#define MAX_CONFIG_LINE 1024
+
 void myfileopt(const char* fn, const struct cmdinfo* cmdinfos);
 void myopt(const char *const **argvp, const struct cmdinfo *cmdinfos);
 void loadcfgfile(const char *prog, const struct cmdinfo *cmdinfos);

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org