diff options
Diffstat (limited to 'kbx')
| -rw-r--r-- | kbx/ChangeLog | 7 | ||||
| -rw-r--r-- | kbx/Makefile.am | 4 | ||||
| -rw-r--r-- | kbx/kbxutil.c | 10 | ||||
| -rw-r--r-- | kbx/keybox-defs.h | 6 | ||||
| -rw-r--r-- | kbx/keybox-dump.c | 2 | ||||
| -rw-r--r-- | kbx/keybox-init.c | 2 | ||||
| -rw-r--r-- | kbx/keybox-search.c | 2 |
7 files changed, 20 insertions, 13 deletions
diff --git a/kbx/ChangeLog b/kbx/ChangeLog index ea4fef8e7..d88500a0e 100644 --- a/kbx/ChangeLog +++ b/kbx/ChangeLog @@ -1,3 +1,10 @@ +2010-03-10 Werner Koch <[email protected]> + + * Makefile.am (kbxutil_LDADD, $(PROGRAMS)): Remove libjnlib.a. + + * keybox-search.c, keybox-init.c, keybox-defs.h, kbxutil.c: + Replace "jnlib" include file part by "common". + 2010-03-08 Werner Koch <[email protected]> Use macros for iobuf_ioctl commands. diff --git a/kbx/Makefile.am b/kbx/Makefile.am index 14e8fa5e2..81a7d3f24 100644 --- a/kbx/Makefile.am +++ b/kbx/Makefile.am @@ -46,8 +46,8 @@ libkeybox_a_SOURCES = $(common_sources) # requires it - although we don't actually need it. It is easier # to do it this way. kbxutil_SOURCES = kbxutil.c $(common_sources) -kbxutil_LDADD = ../common/libcommon.a ../jnlib/libjnlib.a ../gl/libgnu.a \ +kbxutil_LDADD = ../common/libcommon.a ../gl/libgnu.a \ $(KSBA_LIBS) $(LIBGCRYPT_LIBS) \ $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS) -$(PROGRAMS) : ../common/libcommon.a ../jnlib/libjnlib.a ../gl/libgnu.a +$(PROGRAMS) : ../common/libcommon.a ../gl/libgnu.a diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c index 459281110..592f7d467 100644 --- a/kbx/kbxutil.c +++ b/kbx/kbxutil.c @@ -29,10 +29,10 @@ #include <assert.h> #define JNLIB_NEED_LOG_LOGV -#include "../jnlib/logging.h" -#include "../jnlib/argparse.h" -#include "../jnlib/stringhelp.h" -#include "../jnlib/utf8conv.h" +#include "../common/logging.h" +#include "../common/argparse.h" +#include "../common/stringhelp.h" +#include "../common/utf8conv.h" #include "i18n.h" #include "init.h" #include "keybox-defs.h" @@ -433,7 +433,7 @@ main( int argc, char **argv ) /*create_dotlock(NULL); register locking cleanup */ - /* We need to use the gcry malloc function because jnlib does use them */ + /* We need to use the gcry malloc function because jnlib uses them. */ keybox_set_malloc_hooks (gcry_malloc, gcry_realloc, gcry_free); ksba_set_malloc_hooks (gcry_malloc, gcry_realloc, gcry_free ); diff --git a/kbx/keybox-defs.h b/kbx/keybox-defs.h index 626f3e5c3..98d23b326 100644 --- a/kbx/keybox-defs.h +++ b/kbx/keybox-defs.h @@ -34,9 +34,9 @@ owns here. This will not allow us build KBX in a standalone way but there is currently no need for it anyway. Same goes for stringhelp.h which for example provides a replacement for stpcpy - - fixme: Better the LIBOBJ mechnism. */ -#include "../jnlib/types.h" -#include "../jnlib/stringhelp.h" + fixme: Better use the LIBOBJ mechnism. */ +#include "../common/types.h" +#include "../common/stringhelp.h" #include "keybox.h" diff --git a/kbx/keybox-dump.c b/kbx/keybox-dump.c index b671089a0..4be8501a1 100644 --- a/kbx/keybox-dump.c +++ b/kbx/keybox-dump.c @@ -472,7 +472,7 @@ open_file (const char **filename, FILE *outfp) { int save_errno = errno; fprintf (outfp, "can't open `%s': %s\n", *filename, strerror(errno)); - errno = save_errno; + gpg_err_set_errno (save_errno); } return fp; } diff --git a/kbx/keybox-init.c b/kbx/keybox-init.c index e4138647e..c364277e3 100644 --- a/kbx/keybox-init.c +++ b/kbx/keybox-init.c @@ -24,7 +24,7 @@ #include <unistd.h> #include <assert.h> -#include "../jnlib/mischelp.h" +#include "../common/mischelp.h" #include "keybox-defs.h" static KB_NAME kb_names; diff --git a/kbx/keybox-search.c b/kbx/keybox-search.c index be4ca4579..96c873dbe 100644 --- a/kbx/keybox-search.c +++ b/kbx/keybox-search.c @@ -24,7 +24,7 @@ #include <assert.h> #include <errno.h> -#include "../jnlib/stringhelp.h" /* ascii_xxxx() */ +#include "../common/stringhelp.h" /* ascii_xxxx() */ #include "keybox-defs.h" #include <gcrypt.h> |