Selaa lähdekoodia

and now it compiles again

Wichert Akkerman 26 vuotta sitten
vanhempi
commit
9c90e54800
4 muutettua tiedostoa jossa 4 lisäystä ja 3 poistoa
  1. 1 1
      ChangeLog
  2. 1 1
      include/Makefile.in
  3. 1 0
      include/myopt.h
  4. 1 1
      lib/myopt.c

+ 1 - 1
ChangeLog

@@ -2,7 +2,7 @@ Sun Oct  1 20:09:42 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * main/enquiry.c: fix the listpackage output logic
   * main/filesdb.c: fix error cleanup in ensure_statoverride
-  * lib/myopt.c: add myoptfile() so we can read configuration files
+  * lib/myopt.[ch]: add myoptfile() so we can read configuration files
   * main/main.c: call new myoptfile()
   * include/Makefile.in, include/dpkg.h.in: add dpkgconfdir
 

+ 1 - 1
include/Makefile.in

@@ -19,6 +19,6 @@ cvslean:: clean
 dpkg.h: dpkg.h.in
 	sed -e 's,#CONFIGDIR#,$(dpkgconfdir),' \
 		-e 's,#ADMINDIR#,$(admindir),' \
-		-e 's,#LIBDIR#,$(dpkglibdir),; $< > $@
+		-e 's,#LIBDIR#,$(dpkglibdir),' $< > $@
 
 .PHONY: all install clean distclean

+ 1 - 0
include/myopt.h

@@ -36,6 +36,7 @@ struct cmdinfo {
   voidfnp farg;
 };
 
+void myfileopt(const char* fn, const struct cmdinfo* cmdinfos);
 void myopt(const char *const **argvp, const struct cmdinfo *cmdinfos);
 
 #endif /* MYOPT_H */

+ 1 - 1
lib/myopt.c

@@ -26,7 +26,7 @@
 #include <myopt.h>
 #include <dpkg.h>
 
-void myoptfile(const char* fn, const struct cmdinfo* cmdinfos) {
+void myfileopt(const char* fn, const struct cmdinfo* cmdinfos) {
   FILE* file;
   char linebuf[MAXDIVERTFILENAME];