diff options
author | Werner Koch <[email protected]> | 2017-10-05 18:56:06 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2017-10-05 18:56:06 +0000 |
commit | 1b441034eedbc3d95f516f325f053b3d9ba837f1 (patch) | |
tree | b6374605af223984d91b1cee164e3e26661d6604 | |
parent | core: Import of logging.[ch] from GnuPG (diff) | |
download | libgpg-error-1b441034eedbc3d95f516f325f053b3d9ba837f1.tar.gz libgpg-error-1b441034eedbc3d95f516f325f053b3d9ba837f1.zip |
core: Change license of logging.[ch] to LGPLv2.1
--
This file has a long history. I was first written by me in 1998 for
GnuPG under the name logger.c. In 2010 it was renamed to
logging.c. Almost everything was written by me. A few minor fixes are
from g10 Code employees and some other people.
Signed-off-by: Werner Koch <[email protected]>
-rw-r--r-- | src/logging.c | 36 | ||||
-rw-r--r-- | src/logging.h | 44 |
2 files changed, 32 insertions, 48 deletions
diff --git a/src/logging.c b/src/logging.c index 82b21e2..c85d63c 100644 --- a/src/logging.c +++ b/src/logging.c @@ -1,32 +1,24 @@ /* logging.c - Useful logging functions - * Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, - * 2009, 2010 Free Software Foundation, Inc. + * Copyright (C) 1998-2001, 2003-2006, 2009-2010, + * 2017 Free Software Foundation, Inc. + * Copyright (C) 1998-1999, 2001-2006, 2008-2017 Werner Koch * - * This file is part of GnuPG. + * This file is part of Libgpg-error. * - * GnuPG is free software; you can redistribute and/or modify this - * part of GnuPG under the terms of either + * Libgpg-error is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. * - * - the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 3 of the License, or (at - * your option) any later version. - * - * or - * - * - the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at - * your option) any later version. - * - * or both in parallel, as here. - * - * GnuPG is distributed in the hope that it will be useful, but + * Libgpg-error 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. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, see <https://www.gnu.org/licenses/>. * - * You should have received a copies of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, see <https://www.gnu.org/licenses/>. + * This file was originally a part of GnuPG. */ diff --git a/src/logging.h b/src/logging.h index e1bf56b..2fae303 100644 --- a/src/logging.h +++ b/src/logging.h @@ -1,36 +1,28 @@ -/* logging.h - * Copyright (C) 1999, 2000, 2001, 2004, 2006, - * 2010 Free Software Foundation, Inc. +/* logging.h - Definitions for logging.c + * Copyright (C) 1998-2001, 2003-2006, 2009-2010, + * 2017 Free Software Foundation, Inc. + * Copyright (C) 1998-1999, 2001-2006, 2008-2017 Werner Koch * - * This file is part of GnuPG. + * This file is part of Libgpg-error. * - * GnuPG is free software; you can redistribute and/or modify this - * part of GnuPG under the terms of either + * Libgpg-error is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. * - * - the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 3 of the License, or (at - * your option) any later version. - * - * or - * - * - the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at - * your option) any later version. - * - * or both in parallel, as here. - * - * GnuPG is distributed in the hope that it will be useful, but + * Libgpg-error 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. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, see <https://www.gnu.org/licenses/>. * - * You should have received a copies of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, see <https://www.gnu.org/licenses/>. + * This file was originally a part of GnuPG. */ -#ifndef GNUPG_COMMON_LOGGING_H -#define GNUPG_COMMON_LOGGING_H +#ifndef _GPGRT_LOGGING_H +#define _GPGRT_LOGGING_H #include <stdio.h> #include <stdarg.h> @@ -112,4 +104,4 @@ void log_printhex (const char *text, const void *buffer, size_t length); void log_clock (const char *string); -#endif /*GNUPG_COMMON_LOGGING_H*/ +#endif /*_GPGRT_LOGGING_H*/ |