security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-21 10:09:57 +01:00
Code Activity

common: Remove JNLIB from boiler plate (jnlib merge).

Browse Source 
* common/README.jnlib: Remove.
--

This is the final part of merging jnlib into gnupg/common.
This commit is contained in:
Werner Koch 2015-04-24 16:42:28 +02:00
parent 26d7e0d7ac
commit 172b619348
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
31 changed files with 124 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/ChangeLog.jnlib
View File

@ -5,6 +5,9 @@
commit log, and generate a top-level ChangeLog file from logs at
"make dist". See doc/HACKING for details.
[Update 2015-04-24: README.jnlib has been removed and all
references to JNLIB, except for this file, have been removed.]
2010-03-10 Werner Koch <wk@g10code.com>
See gnupg/common/ChangeLog for newer changes.

2
common/Makefile.am
View File

@ -19,7 +19,7 @@
## Process this file with automake to produce Makefile.in
EXTRA_DIST = mkstrtable.awk exaudit.awk exstatus.awk ChangeLog-2011 \
audit-events.h status-codes.h README.jnlib ChangeLog.jnlib \
audit-events.h status-codes.h ChangeLog.jnlib \
ChangeLog-2011.include w32info-rc.h.in gnupg.ico tls-ca.pem
noinst_LIBRARIES = libcommon.a libcommonpth.a libgpgrl.a \

99
common/README.jnlib
View File

@ -1,99 +0,0 @@
JNLIB - This is a collection of utility function which are too small
to put into a library. The code here is licensed under the LGPL.
libjnlib-config.h should be be modified for each project to make these
functions fit into the software. Mainly these are memory functions in
case you need another allocator.
Files which make up jnlib:
README.jnlib
ChangeLog.jnlib
libjnlib-config.h
argparse.c
argparse.h
dotlock.c
dotlock.h
dynload.h
logging.c
logging.h
mischelp.c
mischelp.h
stringhelp.c
stringhelp.h
strlist.c
strlist.h
types.h
utf8conv.c
utf8conv.h
w32-afunix.c
w32-afunix.h
w32-reg.c
w32help.h
xmalloc.c
xmalloc.h
t-stringhelp.c
t-support.c
t-support.h
t-timestuff.c
t-w32-reg.c
Here is a template Makefile.am for these jnlib modules:
===8<==================================================
EXTRA_DIST = README
noinst_PROGRAMS = $(module_tests)
TESTS = $(module_tests)
AM_CPPFLAGS = -I$(top_srcdir)/intl
# We need libgcrypt because libjnlib-config includes gcrypt.h
AM_CFLAGS = $(LIBGCRYPT_CFLAGS)
noinst_LIBRARIES = libjnlib.a
libjnlib_a_SOURCES = \
libjnlib-config.h \
stringhelp.c stringhelp.h \
strlist.c strlist.h \
utf8conv.c utf8conv.h \
argparse.c argparse.h \
logging.c logging.h \
dotlock.c dotlock.h \
types.h mischelp.c mischelp.h dynload.h w32help.h \
xmalloc.c xmalloc.h
if HAVE_W32_SYSTEM
libjnlib_a_SOURCES += w32-reg.c w32-afunix.c w32-afunix.h
endif
#
# Module tests.
#
# These tests should only be used at the canonical location of jnlib
# which is the GnuPG package. The reason for this is that t-support.c
# defines replacements for the actual used memory allocation functions
# so that there is no dependency on libgcrypt.
#
module_tests = t-stringhelp t-timestuff
if HAVE_W32_SYSTEM
module_tests += t-w32-reg
endif
t_jnlib_src = t-support.c t-support.h
t_jnlib_ldadd = libjnlib.a $(LIBINTL) $(LIBICONV)
# For W32 we need libgpg-error because it provides gettext.
if HAVE_W32_SYSTEM
t_jnlib_ldadd += $(GPG_ERROR_LIBS)
endif
t_stringhelp_SOURCES = t-stringhelp.c $(t_jnlib_src)
t_stringhelp_LDADD = $(t_jnlib_ldadd)
t_timestuff_SOURCES = t-timestuff.c $(t_jnlib_src)
t_timestuff_LDADD = $(t_jnlib_ldadd)
if HAVE_W32_SYSTEM
t_w32_reg_SOURCES = t-w32-reg.c $(t_jnlib_src)
t_w32_reg_LDADD = $(t_jnlib_ldadd)
endif
==>8===================================================

6
common/argparse.c
View File

@ -2,9 +2,9 @@
* Copyright (C) 1998-2001, 2006-2008, 2012 Free Software Foundation, Inc.
* Copyright (C) 1997-2001, 2006-2008, 2013-2015 Werner Koch
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -19,7 +19,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.

12
common/argparse.h
View File

@ -1,9 +1,9 @@
/* argparse.h - Argument parser for option handling.
* Copyright (C) 1998,1999,2000,2001,2006 Free Software Foundation, Inc.
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -18,7 +18,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
@ -28,8 +28,8 @@
* if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBJNLIB_ARGPARSE_H
#define LIBJNLIB_ARGPARSE_H
#ifndef GNUPG_COMMON_ARGPARSE_H
#define GNUPG_COMMON_ARGPARSE_H
#include <stdio.h>
@ -200,4 +200,4 @@ const char *strusage (int level);
void set_strusage (const char *(*f)( int ));
void argparse_register_outfnc (int (*fnc)(int, const char *));
#endif /*LIBJNLIB_ARGPARSE_H*/
#endif /*GNUPG_COMMON_ARGPARSE_H*/

6
common/dotlock.c
View File

@ -2,9 +2,9 @@
* Copyright (C) 1998, 2000, 2001, 2003, 2004,
* 2005, 2006, 2008, 2010, 2011 Free Software Foundation, Inc.
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -19,7 +19,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.

12
common/dotlock.h
View File

@ -1,9 +1,9 @@
/* dotlock.h - dotfile locking declarations
* Copyright (C) 2000, 2001, 2006, 2011 Free Software Foundation, Inc.
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -18,7 +18,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
@ -64,8 +64,8 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef LIBJNLIB_DOTLOCK_H
#define LIBJNLIB_DOTLOCK_H
#ifndef GNUPG_COMMON_DOTLOCK_H
#define GNUPG_COMMON_DOTLOCK_H
/* See dotlock.c for a description. */
@ -109,4 +109,4 @@ void dotlock_remove_lockfiles (void);
#ifdef __cplusplus
}
#endif
#endif /*LIBJNLIB_DOTLOCK_H*/
#endif /*GNUPG_COMMON_DOTLOCK_H*/

12
common/dynload.h
View File

@ -1,9 +1,9 @@
/* dynload.h - Wrapper functions for run-time dynamic loading
* Copyright (C) 2003, 2010 Free Software Foundation, Inc.
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -18,7 +18,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
@ -28,8 +28,8 @@
* if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBJNLIB_DYNLOAD_H
#define LIBJNLIB_DYNLOAD_H
#ifndef GNUPG_COMMON_DYNLOAD_H
#define GNUPG_COMMON_DYNLOAD_H
#ifndef __MINGW32__
# include <dlfcn.h>
@ -94,4 +94,4 @@ dlclose (void * hd)
return -1;
}
# endif /*__MINGW32__*/
#endif /*LIBJNLIB_DYNLOAD_H*/
#endif /*GNUPG_COMMON_DYNLOAD_H*/

6
common/logging.c
View File

@ -2,9 +2,9 @@
* Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
* 2009, 2010 Free Software Foundation, Inc.
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -19,7 +19,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.

12
common/logging.h
View File

@ -2,9 +2,9 @@
* Copyright (C) 1999, 2000, 2001, 2004, 2006,
* 2010 Free Software Foundation, Inc.
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -19,7 +19,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
@ -29,8 +29,8 @@
* if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBJNLIB_LOGGING_H
#define LIBJNLIB_LOGGING_H
#ifndef GNUPG_COMMON_LOGGING_H
#define GNUPG_COMMON_LOGGING_H
#include <stdio.h>
#include <stdarg.h>
@ -96,4 +96,4 @@ void log_printhex (const char *text, const void *buffer, size_t length);
void log_clock (const char *string);
#endif /*LIBJNLIB_LOGGING_H*/
#endif /*GNUPG_COMMON_LOGGING_H*/

6
common/mischelp.c
View File

@ -1,9 +1,9 @@
/* mischelp.c - Miscellaneous helper functions
* Copyright (C) 1998, 2000, 2001, 2006, 2007 Free Software Foundation, Inc.
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -18,7 +18,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.

12
common/mischelp.h
View File

@ -2,9 +2,9 @@
* Copyright (C) 1999, 2000, 2001, 2002, 2003,
* 2006, 2007, 2009 Free Software Foundation, Inc.
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -19,7 +19,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
@ -29,8 +29,8 @@
* if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBJNLIB_MISCHELP_H
#define LIBJNLIB_MISCHELP_H
#ifndef GNUPG_COMMON_MISCHELP_H
#define GNUPG_COMMON_MISCHELP_H
/* Check whether the files NAME1 and NAME2 are identical. This is for
@ -118,4 +118,4 @@ time_t timegm (struct tm *tm);
#endif /*GNUPG_COMMON_NEED_AFLOCAL*/
#endif /*LIBJNLIB_MISCHELP_H*/
#endif /*GNUPG_COMMON_MISCHELP_H*/

6
common/stringhelp.c
View File

@ -4,9 +4,9 @@
* Copyright (C) 2014 Werner Koch
* Copyright (C) 2015 g10 Code GmbH
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -21,7 +21,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.

12
common/stringhelp.h
View File

@ -3,9 +3,9 @@
* 2006, 2007, 2009 Free Software Foundation, Inc.
* 2015 g10 Code GmbH
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -20,7 +20,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
@ -30,8 +30,8 @@
* if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBJNLIB_STRINGHELP_H
#define LIBJNLIB_STRINGHELP_H
#ifndef GNUPG_COMMON_STRINGHELP_H
#define GNUPG_COMMON_STRINGHELP_H
#include "types.h"
@ -148,4 +148,4 @@ char **strsplit (char *string, char delim, char replacement, int *count);
/*-- mapstrings.c --*/
const char *map_static_macro_string (const char *string);
#endif /*LIBJNLIB_STRINGHELP_H*/
#endif /*GNUPG_COMMON_STRINGHELP_H*/

6
common/strlist.c
View File

@ -2,9 +2,9 @@
* Copyright (C) 1998, 2000, 2001, 2006 Free Software Foundation, Inc.
* Copyright (C) 2015 g10 Code GmbH
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -19,7 +19,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.

12
common/strlist.h
View File

@ -1,9 +1,9 @@
/* strlist.h
* Copyright (C) 1998, 2000, 2001, 2006 Free Software Foundation, Inc.
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -18,7 +18,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
@ -28,8 +28,8 @@
* if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBJNLIB_STRLIST_H
#define LIBJNLIB_STRLIST_H
#ifndef GNUPG_COMMON_STRLIST_H
#define GNUPG_COMMON_STRLIST_H
struct string_list
{
@ -61,4 +61,4 @@ strlist_t strlist_find (strlist_t haystack, const char *needle);
#define FREE_STRLIST(a) do { free_strlist((a)); (a) = NULL ; } while(0)
#endif /*LIBJNLIB_STRLIST_H*/
#endif /*GNUPG_COMMON_STRLIST_H*/

6
common/t-stringhelp.c
View File

@ -2,9 +2,9 @@
* Copyright (C) 2007 Free Software Foundation, Inc.
* 2015 g10 Code GmbH
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -19,7 +19,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.

6
common/t-support.c
View File

@ -1,9 +1,9 @@
/* t-support.c - helper functions for the regression tests.
* Copyright (C) 2007 Free Software Foundation, Inc.
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -18,7 +18,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.

12
common/t-support.h
View File

@ -1,9 +1,9 @@
/* t-support.h - Helper for the regression tests
* Copyright (C) 2007 Free Software Foundation, Inc.
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -18,7 +18,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
@ -28,8 +28,8 @@
* if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBJNLIB_T_SUPPORT_H
#define LIBJNLIB_T_SUPPORT_H 1
#ifndef GNUPG_COMMON_T_SUPPORT_H
#define GNUPG_COMMON_T_SUPPORT_H 1
#ifdef GCRYPT_VERSION
#error The regression tests should not include with gcrypt.h
@ -73,4 +73,4 @@ void gcry_free (void *a);
} while(0)
#endif /*LIBJNLIB_T_SUPPORT_H*/
#endif /*GNUPG_COMMON_T_SUPPORT_H*/

6
common/t-timestuff.c
View File

@ -1,9 +1,9 @@
/* t-timestuff.c - Regression tests for time functions
* Copyright (C) 2007 Free Software Foundation, Inc.
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -18,7 +18,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.

6
common/t-w32-reg.c
View File

@ -1,9 +1,9 @@
/* t-w32-reg.c - Regression tests for W32 registry functions
* Copyright (C) 2010 Free Software Foundation, Inc.
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -18,7 +18,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.

12
common/types.h
View File

@ -1,9 +1,9 @@
/* types.h - define some extra types
* Copyright (C) 1999, 2000, 2001, 2006 Free Software Foundation, Inc.
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -18,7 +18,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
@ -28,8 +28,8 @@
* if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBJNLIB_TYPES_H
#define LIBJNLIB_TYPES_H
#ifndef GNUPG_COMMON_TYPES_H
#define GNUPG_COMMON_TYPES_H
#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
@ -123,4 +123,4 @@
# define GNUPG_GCC_A_SENTINEL(a)
#endif
#endif /*LIBJNLIB_TYPES_H*/
#endif /*GNUPG_COMMON_TYPES_H*/

6
common/utf8conv.c
View File

@ -2,9 +2,9 @@
* Copyright (C) 1994, 1998, 1999, 2000, 2001, 2003, 2006,
* 2008, 2010 Free Software Foundation, Inc.
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -19,7 +19,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.

12
common/utf8conv.h
View File

@ -1,9 +1,9 @@
/* utf8conf.h
* Copyright (C) 2003, 2006 Free Software Foundation, Inc.
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -18,7 +18,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
@ -28,8 +28,8 @@
* if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBJNLIB_UTF8CONF_H
#define LIBJNLIB_UTF8CONF_H
#ifndef GNUPG_COMMON_UTF8CONF_H
#define GNUPG_COMMON_UTF8CONF_H
int set_native_charset (const char *newset);
const char *get_native_charset (void);
@ -53,4 +53,4 @@ wchar_t *utf8_to_wchar (const char *string);
#endif /*HAVE_W32_SYSTEM*/
#endif /*LIBJNLIB_UTF8CONF_H*/
#endif /*GNUPG_COMMON_UTF8CONF_H*/

6
common/util.h
View File

@ -1,9 +1,9 @@
/* util.h - Utility functions for GnuPG
* Copyright (C) 2001, 2002, 2003, 2004, 2009 Free Software Foundation, Inc.
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -18,7 +18,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.

6
common/w32-afunix.c
View File

@ -1,9 +1,9 @@
/* w32-afunix.c - AF_UNIX emulation for Windows (Client only).
* Copyright (C) 2004, 2006 g10 Code GmbH
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -18,7 +18,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.

6
common/w32-afunix.h
View File

@ -1,9 +1,9 @@
/* w32-afunix.h - AF_UNIX emulation for Windows
* Copyright (C) 2004, 2006 g10 Code GmbH
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -18,7 +18,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.

6
common/w32-reg.c
View File

@ -1,9 +1,9 @@
/* w32-reg.c - MS-Windows Registry access
* Copyright (C) 1999, 2002, 2007 Free Software Foundation, Inc.
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -18,7 +18,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.

12
common/w32help.h
View File

@ -1,9 +1,9 @@
/* w32help.h - W32 speicif functions
* Copyright (C) 2007 Free Software Foundation, Inc.
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -18,7 +18,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
@ -28,8 +28,8 @@
* if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBJNLIB_W32HELP_H
#define LIBJNLIB_W32HELP_H
#ifndef GNUPG_COMMON_W32HELP_H
#define GNUPG_COMMON_W32HELP_H
#ifdef HAVE_W32_SYSTEM
/*-- w32-reg.c --*/
@ -53,4 +53,4 @@ umask (int a)
#endif /*HAVE_W32CE_SYSTEM*/
#endif /*HAVE_W32_SYSTEM*/
#endif /*LIBJNLIB_MISCHELP_H*/
#endif /*GNUPG_COMMON_MISCHELP_H*/

6
common/xmalloc.c
View File

@ -1,9 +1,9 @@
/* xmalloc.c - standard malloc wrappers
* Copyright (C) 1999, 2000, 2001, 2006 Free Software Foundation, Inc.
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -18,7 +18,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.

12
common/xmalloc.h
View File

@ -1,9 +1,9 @@
/* xmalloc.h
* Copyright (C) 1999, 2000, 2001, 2006 Free Software Foundation, Inc.
*
* This file is part of JNLIB, which is a subsystem of GnuPG.
* This file is part of GnuPG.
*
* JNLIB is free software; you can redistribute it and/or modify it
* GnuPG is free software; you can redistribute it and/or modify it
* under the terms of either
*
* - the GNU Lesser General Public License as published by the Free
@ -18,7 +18,7 @@
*
* or both in parallel, as here.
*
* JNLIB is distributed in the hope that it will be useful, but
* GnuPG is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
@ -28,8 +28,8 @@
* if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBJNLIB_XMALLOC_H
#define LIBJNLIB_XMALLOC_H
#ifndef GNUPG_COMMON_XMALLOC_H
#define GNUPG_COMMON_XMALLOC_H
void *xmalloc( size_t n );
void *xrealloc( void *a, size_t n );
@ -38,4 +38,4 @@ char *xstrdup( const char *string );
char *xstrcat2( const char *a, const char *b );
#endif /*LIBJNLIB_XMALLOC_H*/
#endif /*GNUPG_COMMON_XMALLOC_H*/