From: Jonathan McDowell Date: Mon, 31 May 2004 23:47:46 +0000 (+0000) Subject: cscvs to tla changeset 83 X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/commitdiff_plain/05d5b193ee05a187d4f3fd05a4be1fbb6bf937b6 cscvs to tla changeset 83 Author: noodles Date: 2003/06/07 13:45:34 Clean up some compile warnings (C++ comments, missing #includes) --- diff --git a/armor.c b/armor.c index d584deb..3f47f64 100644 --- a/armor.c +++ b/armor.c @@ -5,7 +5,7 @@ * * Copyright 2002 Project Purple * - * $Id: armor.c,v 1.5 2003/06/04 20:57:06 noodles Exp $ + * $Id: armor.c,v 1.6 2003/06/07 13:45:34 noodles Exp $ */ #include @@ -211,16 +211,19 @@ static void dearmor_init(struct dearmor_context *ctx) static void dearmor_finish(struct dearmor_context *state) { - // Check the checksum, + /* + * Check the checksum + */ state->crc24 &= 0xffffffL; -// state->putchar_func(state->ctx, '\n'); -// state->putchar_func(state->ctx, '='); -// state->putchar_func(state->ctx, encode64(state->crc24 >> 18)); -// state->putchar_func(state->ctx, encode64((state->crc24 >> 12) & 0x3F)); -// state->putchar_func(state->ctx, encode64((state->crc24 >> 6) & 0x3F)); -// state->putchar_func(state->ctx, encode64(state->crc24 & 0x3F)); - + /* + state->putchar_func(state->ctx, '\n'); + state->putchar_func(state->ctx, '='); + state->putchar_func(state->ctx, encode64(state->crc24 >> 18)); + state->putchar_func(state->ctx, encode64((state->crc24 >> 12) & 0x3F)); + state->putchar_func(state->ctx, encode64((state->crc24 >> 6) & 0x3F)); + state->putchar_func(state->ctx, encode64(state->crc24 & 0x3F)); + */ } @@ -395,7 +398,9 @@ int dearmor_openpgp_stream(int (*getchar_func)(void *ctx, size_t count, dearmor_ctx.ctx = ctx; read_openpgp_stream(dearmor_getchar_c, &dearmor_ctx, packets); dearmor_finish(&dearmor_ctx); - // TODO: Look for armor footer + /* + * TODO: Look for armor footer + */ } return 0; diff --git a/keydb.h b/keydb.h index cbdf63d..b356bb8 100644 --- a/keydb.h +++ b/keydb.h @@ -5,13 +5,12 @@ * * Copyright 2002 Project Purple * - * $Id: keydb.h,v 1.7 2003/06/04 20:57:08 noodles Exp $ + * $Id: keydb.h,v 1.8 2003/06/07 13:45:34 noodles Exp $ */ #ifndef __KEYDB_H__ #define __KEYDB_H__ -// #include #include #include "keystructs.h" diff --git a/keyid.h b/keyid.h index 8a36056..da4cd4d 100644 --- a/keyid.h +++ b/keyid.h @@ -5,13 +5,12 @@ * * Copyright 2002 Project Purple * - * $Id: keyid.h,v 1.4 2003/06/04 20:57:09 noodles Exp $ + * $Id: keyid.h,v 1.5 2003/06/07 13:45:34 noodles Exp $ */ #ifndef __KEYID_H__ #define __KEYID_H__ -// #include #include #include "keystructs.h" diff --git a/lookup.c b/lookup.c index 33d023d..71c27c3 100644 --- a/lookup.c +++ b/lookup.c @@ -5,14 +5,14 @@ * * Copyright 2002 Project Purple * - * $Id: lookup.c,v 1.9 2003/06/04 22:11:41 noodles Exp $ + * $Id: lookup.c,v 1.10 2003/06/07 13:45:34 noodles Exp $ */ -//#include #include #include #include #include +#include #include #include "armor.h" diff --git a/mem.c b/mem.c index 9bee71d..4a713e4 100644 --- a/mem.c +++ b/mem.c @@ -5,12 +5,13 @@ * * Copyright 2002 Project Purple * - * $Id: mem.c,v 1.5 2003/06/04 20:57:10 noodles Exp $ + * $Id: mem.c,v 1.6 2003/06/07 13:45:35 noodles Exp $ */ #include #include #include +#include #include "keystructs.h" #include "ll.h" diff --git a/merge.c b/merge.c index 6ed0a2d..c51474c 100644 --- a/merge.c +++ b/merge.c @@ -5,7 +5,7 @@ * * Copyright 2002 Project Purple * - * $Id: merge.c,v 1.10 2003/06/04 20:57:11 noodles Exp $ + * $Id: merge.c,v 1.11 2003/06/07 13:45:35 noodles Exp $ */ #include @@ -149,7 +149,9 @@ bool remove_signed_packet(struct openpgp_signedpacket_list **packet_list, if (cur->next == NULL) { *list_end = prev; } - // TODO: Free the removed signed packet... + /* + * TODO: Free the removed signed packet... + */ } prev = cur; } diff --git a/sha.h b/sha.h index 829bb34..3803c68 100644 --- a/sha.h +++ b/sha.h @@ -5,7 +5,6 @@ #include #include #include -// #include #include #include "bithelp.h"