security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

gpg: Consistent use of preprocessor conditionals. 

* g10/parse-packet.c: Use '#if' instead of '#ifdef' when checking
DEBUG_PARSE_PACKET.  This fixes the build with '#define
DEBUG_PARSE_PACKET 0'.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2017-03-30 12:35:18 +02:00
parent 214fa90122
commit 5e89144cbc
No known key found for this signature in database
GPG Key ID: DD1A52F9DA8C9020
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
g10/parse-packet.c
View File

@ -50,7 +50,7 @@ static estream_t listfp;
static int parse (parse_packet_ctx_t ctx, PACKET *pkt, int onlykeypkts, static int parse (parse_packet_ctx_t ctx, PACKET *pkt, int onlykeypkts,
off_t * retpos, int *skip, IOBUF out, int do_skip off_t * retpos, int *skip, IOBUF out, int do_skip
#ifdef DEBUG_PARSE_PACKET #if DEBUG_PARSE_PACKET
, const char *dbg_w, const char *dbg_f, int dbg_l , const char *dbg_w, const char *dbg_f, int dbg_l
#endif #endif
); );
@ -261,7 +261,7 @@ unknown_pubkey_warning (int algo)
} }
#ifdef DEBUG_PARSE_PACKET #if DEBUG_PARSE_PACKET
int int
dbg_parse_packet (parse_packet_ctx_t ctx, PACKET *pkt, dbg_parse_packet (parse_packet_ctx_t ctx, PACKET *pkt,
const char *dbg_f, int dbg_l) const char *dbg_f, int dbg_l)
@ -295,7 +295,7 @@ parse_packet (parse_packet_ctx_t ctx, PACKET *pkt)
* Like parse packet, but only return secret or public (sub)key * Like parse packet, but only return secret or public (sub)key
* packets. * packets.
*/ */
#ifdef DEBUG_PARSE_PACKET #if DEBUG_PARSE_PACKET
int int
dbg_search_packet (parse_packet_ctx_t ctx, PACKET *pkt, dbg_search_packet (parse_packet_ctx_t ctx, PACKET *pkt,
off_t * retpos, int with_uid, off_t * retpos, int with_uid,
@ -331,7 +331,7 @@ search_packet (parse_packet_ctx_t ctx, PACKET *pkt,
/* /*
* Copy all packets from INP to OUT, thereby removing unused spaces. * Copy all packets from INP to OUT, thereby removing unused spaces.
*/ */
#ifdef DEBUG_PARSE_PACKET #if DEBUG_PARSE_PACKET
int int
dbg_copy_all_packets (iobuf_t inp, iobuf_t out, const char *dbg_f, int dbg_l) dbg_copy_all_packets (iobuf_t inp, iobuf_t out, const char *dbg_f, int dbg_l)
{ {
@ -388,7 +388,7 @@ copy_all_packets (iobuf_t inp, iobuf_t out)
* Stop at offset STOPoff (i.e. don't copy packets at this or later * Stop at offset STOPoff (i.e. don't copy packets at this or later
* offsets) * offsets)
*/ */
#ifdef DEBUG_PARSE_PACKET #if DEBUG_PARSE_PACKET
int int
dbg_copy_some_packets (iobuf_t inp, iobuf_t out, off_t stopoff, dbg_copy_some_packets (iobuf_t inp, iobuf_t out, off_t stopoff,
const char *dbg_f, int dbg_l) const char *dbg_f, int dbg_l)
@ -448,7 +448,7 @@ copy_some_packets (iobuf_t inp, iobuf_t out, off_t stopoff)
/* /*
* Skip over N packets * Skip over N packets
*/ */
#ifdef DEBUG_PARSE_PACKET #if DEBUG_PARSE_PACKET
int int
dbg_skip_some_packets (iobuf_t inp, unsigned n, const char *dbg_f, int dbg_l) dbg_skip_some_packets (iobuf_t inp, unsigned n, const char *dbg_f, int dbg_l)
{ {
@ -524,7 +524,7 @@ skip_some_packets (iobuf_t inp, unsigned int n)
static int static int
parse (parse_packet_ctx_t ctx, PACKET *pkt, int onlykeypkts, off_t * retpos, parse (parse_packet_ctx_t ctx, PACKET *pkt, int onlykeypkts, off_t * retpos,
int *skip, IOBUF out, int do_skip int *skip, IOBUF out, int do_skip
#ifdef DEBUG_PARSE_PACKET #if DEBUG_PARSE_PACKET
, const char *dbg_w, const char *dbg_f, int dbg_l , const char *dbg_w, const char *dbg_f, int dbg_l
#endif #endif
) )
@ -747,7 +747,7 @@ parse (parse_packet_ctx_t ctx, PACKET *pkt, int onlykeypkts, off_t * retpos,
if (DBG_PACKET) if (DBG_PACKET)
{ {
#ifdef DEBUG_PARSE_PACKET #if DEBUG_PARSE_PACKET
log_debug ("parse_packet(iob=%d): type=%d length=%lu%s (%s.%s.%d)\n", log_debug ("parse_packet(iob=%d): type=%d length=%lu%s (%s.%s.%d)\n",
iobuf_id (inp), pkttype, pktlen, new_ctb ? " (new_ctb)" : "", iobuf_id (inp), pkttype, pktlen, new_ctb ? " (new_ctb)" : "",
dbg_w, dbg_f, dbg_l); dbg_w, dbg_f, dbg_l);