gnupg/g10 (ChangeLog Makefile.am comment.c main.h packet.h)
cvs user dshaw
cvs at cvs.gnupg.org
Fri May 6 00:14:28 CEST 2005
Date: Friday, May 6, 2005 @ 00:32:52
Author: dshaw
Path: /cvs/gnupg/gnupg/g10
Modified: ChangeLog Makefile.am main.h packet.h
Removed: comment.c
* Makefile.am, packet.h, main.h, comment.c: Remove comment.c. We don't
use any of these functions any longer.
-------------+
ChangeLog | 3 +
Makefile.am | 1
comment.c | 103 ----------------------------------------------------------
main.h | 4 --
packet.h | 3 -
5 files changed, 3 insertions(+), 111 deletions(-)
Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.730 gnupg/g10/ChangeLog:1.731
--- gnupg/g10/ChangeLog:1.730 Fri May 6 00:08:37 2005
+++ gnupg/g10/ChangeLog Fri May 6 00:32:52 2005
@@ -1,5 +1,8 @@
2005-05-05 David Shaw <dshaw at jabberwocky.com>
+ * Makefile.am, packet.h, main.h, comment.c: Remove comment.c. We
+ don't use any of these functions any longer.
+
* keygen.c (start_tree): New function to "prime" a KBNODE list.
(do_generate_keypair): Use it here rather than creating and
deleting a comment packet.
Index: gnupg/g10/Makefile.am
diff -u gnupg/g10/Makefile.am:1.90 gnupg/g10/Makefile.am:1.91
--- gnupg/g10/Makefile.am:1.90 Fri Mar 18 00:14:47 2005
+++ gnupg/g10/Makefile.am Fri May 6 00:32:52 2005
@@ -62,7 +62,6 @@
keyid.c \
packet.h \
parse-packet.c \
- comment.c \
status.c \
status.h \
plaintext.c \
Index: gnupg/g10/comment.c
diff -u gnupg/g10/comment.c:1.12 gnupg/g10/comment.c:removed
--- gnupg/g10/comment.c:1.12 Sat Jun 29 15:46:33 2002
+++ gnupg/g10/comment.c Fri May 6 00:32:53 2005
@@ -1,103 +0,0 @@
-/* comment.c - write comment stuff
- * Copyright (C) 1998 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of 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.
- *
- * GnuPG 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-
-#include "options.h"
-#include "packet.h"
-#include "errors.h"
-#include "iobuf.h"
-#include "memory.h"
-#include "util.h"
-#include "main.h"
-#include "keydb.h"
-
-
-
-int
-write_comment( IOBUF out, const char *s )
-{
- PACKET pkt;
- size_t n = strlen(s);
- int rc=0;
-
- pkt.pkttype = PKT_COMMENT;
- if( *s != '#' ) {
- pkt.pkt.comment = m_alloc( sizeof *pkt.pkt.comment + n );
- pkt.pkt.comment->len = n+1;
- *pkt.pkt.comment->data = '#';
- strcpy(pkt.pkt.comment->data+1, s);
- }
- else {
- pkt.pkt.comment = m_alloc( sizeof *pkt.pkt.comment + n - 1 );
- pkt.pkt.comment->len = n;
- strcpy(pkt.pkt.comment->data, s);
- }
- if( (rc = build_packet( out, &pkt )) )
- log_error("build_packet(comment) failed: %s\n", g10_errstr(rc) );
- free_packet( &pkt );
- return rc;
-}
-
-
-KBNODE
-make_comment_node( const char *s )
-{
- PACKET *pkt;
- size_t n = strlen(s);
-
- pkt = m_alloc_clear( sizeof *pkt );
- pkt->pkttype = PKT_COMMENT;
- pkt->pkt.comment = m_alloc( sizeof *pkt->pkt.comment + n - 1 );
- pkt->pkt.comment->len = n;
- strcpy(pkt->pkt.comment->data, s);
- return new_kbnode( pkt );
-}
-
-
-KBNODE
-make_mpi_comment_node( const char *s, MPI a )
-{
- PACKET *pkt;
- byte *buf, *p, *pp;
- unsigned n1, nb1;
- size_t n = strlen(s);
-
- nb1 = mpi_get_nbits( a );
- p = buf = mpi_get_buffer( a, &n1, NULL );
- pkt = m_alloc_clear( sizeof *pkt );
- pkt->pkttype = PKT_COMMENT;
- pkt->pkt.comment = m_alloc( sizeof *pkt->pkt.comment + n + 2 + n1 );
- pkt->pkt.comment->len = n+1+2+n1;
- pp = pkt->pkt.comment->data;
- memcpy(pp, s, n+1);
- pp[n+1] = nb1 >> 8;
- pp[n+2] = nb1 ;
- memcpy(pp+n+3, p, n1 );
- m_free(buf);
- return new_kbnode( pkt );
-}
-
-
Index: gnupg/g10/main.h
diff -u gnupg/g10/main.h:1.127 gnupg/g10/main.h:1.128
--- gnupg/g10/main.h:1.127 Thu May 5 21:21:40 2005
+++ gnupg/g10/main.h Fri May 6 00:32:52 2005
@@ -198,10 +198,6 @@
MPI encode_md_value( int pubkey_algo, MD_HANDLE md,
int hash_algo, unsigned nbits );
-/*-- comment.c --*/
-KBNODE make_comment_node( const char *s );
-KBNODE make_mpi_comment_node( const char *s, MPI a );
-
/*-- import.c --*/
int parse_import_options(char *str,unsigned int *options,int noisy);
void import_keys( char **fnames, int nnames,
Index: gnupg/g10/packet.h
diff -u gnupg/g10/packet.h:1.93 gnupg/g10/packet.h:1.94
--- gnupg/g10/packet.h:1.93 Thu Dec 30 04:26:57 2004
+++ gnupg/g10/packet.h Fri May 6 00:32:52 2005
@@ -503,9 +503,6 @@
int ask_for_detached_datafile( MD_HANDLE md, MD_HANDLE md2,
const char *inname, int textmode );
-/*-- comment.c --*/
-int write_comment( IOBUF out, const char *s );
-
/*-- sign.c --*/
int make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
PKT_user_id *uid, PKT_public_key *subpk,
More information about the Gnupg-commits
mailing list