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

gpg,tools: Remove use of repo only zlib-riscos.h.

Browse Source 
* g10/compress.c: Don't use zlib-riscos.h.
* tools/gpgsplit.c: Likewise.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2022-03-29 12:07:18 +09:00
parent a67a09be30
commit 2cebba7274
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
g10/compress.c
View File

@ -32,9 +32,6 @@
#include <errno.h> #include <errno.h>
#ifdef HAVE_ZIP #ifdef HAVE_ZIP
# include <zlib.h> # include <zlib.h>
# if defined(__riscos__) && defined(USE_ZLIBRISCOS)
# include "zlib-riscos.h"
# endif
#endif #endif
#include "gpg.h" #include "gpg.h"
@ -63,13 +60,6 @@ init_compress( compress_filter_context_t *zfx, z_stream *zs )
int rc; int rc;
int level; int level;
#if defined(__riscos__) && defined(USE_ZLIBRISCOS)
static int zlib_initialized = 0;
if (!zlib_initialized)
zlib_initialized = riscos_load_module("ZLib", zlib_path, 1);
#endif
if( opt.compress_level >= 1 && opt.compress_level <= 9 ) if( opt.compress_level >= 1 && opt.compress_level <= 9 )
level = opt.compress_level; level = opt.compress_level;
else if( opt.compress_level == -1 ) else if( opt.compress_level == -1 )

9
tools/gpgsplit.c
View File

@ -34,9 +34,6 @@
#ifdef HAVE_ZIP #ifdef HAVE_ZIP
# include <zlib.h> # include <zlib.h>
#endif #endif
#if defined(__riscos__) && defined(USE_ZLIBRISCOS)
# include "zlib-riscos.h"
#endif
#define INCLUDED_BY_MAIN_MODULE 1 #define INCLUDED_BY_MAIN_MODULE 1
#include "../common/util.h" #include "../common/util.h"
@ -548,12 +545,6 @@ write_part (FILE *fpin, unsigned long pktlen,
unsigned char *p; unsigned char *p;
const char *outname = create_filename (pkttype); const char *outname = create_filename (pkttype);
#if defined(__riscos__) && defined(USE_ZLIBRISCOS)
static int initialized = 0;
if (!initialized)
initialized = riscos_load_module("ZLib", zlib_path, 1);
#endif
if (opt_no_split) if (opt_no_split)
fpout = stdout; fpout = stdout;
else else