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 d584deb3072f744bb30a251843a09be9401cc5c4..3f47f64f01637a46b14390a658f557e71a555ea6 100644 (file)
--- a/armor.c
+++ b/armor.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
  *
  * 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 <assert.h>
  */
 
 #include <assert.h>


@@ -211,16 +211,19 @@ static void dearmor_init(struct dearmor_context *ctx)
 
 static void dearmor_finish(struct dearmor_context *state)
 {
 
 static void dearmor_finish(struct dearmor_context *state)
 {

-       // Check the checksum,
+       /*
+        * Check the checksum
+        */

 
        state->crc24 &= 0xffffffL;
 
        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);
                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;
        }
 
        return 0;

diff --git a/keydb.h b/keydb.h
index cbdf63dbe1fb82946e507a03847d6fed227dce32..b356bb85380340b6d0f6f06aaa609c59587a0241 100644 (file)
--- a/keydb.h
+++ b/keydb.h
@@ -5,13 +5,12 @@
  *
  * Copyright 2002 Project Purple
  *
  *
  * 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__
 
  */
 
 #ifndef __KEYDB_H__
 #define __KEYDB_H__
 

-// #include <stdint.h>

 #include <inttypes.h>
 
 #include "keystructs.h"
 #include <inttypes.h>
 
 #include "keystructs.h"

diff --git a/keyid.h b/keyid.h
index 8a360568aae194b4f964f369937825cf1f8803ab..da4cd4d5a624196432d27a8282bf79b7b32103ad 100644 (file)
--- a/keyid.h
+++ b/keyid.h
@@ -5,13 +5,12 @@
  *
  * Copyright 2002 Project Purple
  *
  *
  * 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__
 
  */
 
 #ifndef __KEYID_H__
 #define __KEYID_H__
 

-// #include <stdint.h>

 #include <inttypes.h>
 
 #include "keystructs.h"
 #include <inttypes.h>
 
 #include "keystructs.h"

diff --git a/lookup.c b/lookup.c
index 33d023d9357d8a81607541a2ecdb9f7d2b8e54be..71c27c3357f32e27806fd0be668a8c5d244b7a3b 100644 (file)
--- a/lookup.c
+++ b/lookup.c
@@ -5,14 +5,14 @@
  *
  * Copyright 2002 Project Purple
  *
  *
  * 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 <stdint.h>

 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>

+#include <string.h>

 #include <unistd.h>
 
 #include "armor.h"
 #include <unistd.h>
 
 #include "armor.h"

diff --git a/mem.c b/mem.c
index 9bee71d14fe503e9278596f5f4a492db548c399a..4a713e4ea5dec6b67fdfb8ff78a0ea22551432e9 100644 (file)
--- a/mem.c
+++ b/mem.c
@@ -5,12 +5,13 @@
  *
  * Copyright 2002 Project Purple
  *
  *
  * 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 <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
  */
 
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>

+#include <string.h>

 
 #include "keystructs.h"
 #include "ll.h"
 
 #include "keystructs.h"
 #include "ll.h"

diff --git a/merge.c b/merge.c
index 6ed0a2d139a40af796251862a7cb624f4fc6deeb..c51474c753bd06b0866878d284159771e4cdcebe 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
  *
  * 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 <assert.h>
  */
 
 #include <assert.h>


@@ -149,7 +149,9 @@ bool remove_signed_packet(struct openpgp_signedpacket_list **packet_list,
                        if (cur->next == NULL) {
                                *list_end = prev;
                        }
                        if (cur->next == NULL) {
                                *list_end = prev;
                        }

-                       // TODO: Free the removed signed packet...
+                       /*
+                        * TODO: Free the removed signed packet...
+                        */

                }
                prev = cur;
        }
                }
                prev = cur;
        }

diff --git a/sha.h b/sha.h
index 829bb346438f3397e0572d4e76dde3804696aabf..3803c687df01376023a388644169e8fcfe7062bf 100644 (file)
--- a/sha.h
+++ b/sha.h
@@ -5,7 +5,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>

-// #include <stdint.h>

 #include <inttypes.h>
 
 #include "bithelp.h"
 #include <inttypes.h>
 
 #include "bithelp.h"