gnupg/g10 (ChangeLog passphrase.c signal.c)

[cvs user dshaw]

    Date: Wednesday, June 1, 2005 @ 21:13:05
  Author: dshaw
    Path: /cvs/gnupg/gnupg/g10

Modified: ChangeLog passphrase.c signal.c

* signal.c [HAVE_DOSISH_SYSTEM]: Fix unused function warnings on mingw32.  
Noted by Joe Vender.

* passphrase.c [_WIN32]: Remove unused variables.


--------------+
 ChangeLog    |    7 +++++++
 passphrase.c |   11 ++---------
 signal.c     |   18 ++++++++----------
 3 files changed, 17 insertions(+), 19 deletions(-)


Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.748 gnupg/g10/ChangeLog:1.749
--- gnupg/g10/ChangeLog:1.748	Tue May 31 21:12:10 2005
+++ gnupg/g10/ChangeLog	Wed Jun  1 21:13:05 2005
@@ -1,3 +1,10 @@
+2005-06-01  David Shaw  <dshaw at jabberwocky.com>
+
+	* signal.c [HAVE_DOSISH_SYSTEM]: Fix unused function warnings on
+	mingw32.  Noted by Joe Vender.
+
+	* passphrase.c [_WIN32]: Remove unused variables.
+
 2005-05-31  David Shaw  <dshaw at jabberwocky.com>
 
 	* keyedit.c (menu_clean_uids_from_key,
Index: gnupg/g10/passphrase.c
diff -u gnupg/g10/passphrase.c:1.81 gnupg/g10/passphrase.c:1.82
--- gnupg/g10/passphrase.c:1.81	Tue May 31 10:39:16 2005
+++ gnupg/g10/passphrase.c	Wed Jun  1 21:13:05 2005
@@ -1,6 +1,6 @@
 /* passphrase.c -  Get a passphrase
- * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
- *               2004, 2005 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ *               2005 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -73,17 +73,10 @@
                      *(p) <= 'F'? (*(p)-'A'+10):(*(p)-'a'+10))
 #define xtoi_2(p)   ((xtoi_1(p) * 16) + xtoi_1((p)+1))
 
-
-
 static char *fd_passwd = NULL;
 static char *next_pw = NULL;
 static char *last_pw = NULL;
 
-#if defined (_WIN32)
-static int read_fd = 0;
-static int write_fd = 0;
-#endif
-
 static void hash_passphrase( DEK *dek, char *pw, STRING2KEY *s2k, int create );
 
 int
Index: gnupg/g10/signal.c
diff -u gnupg/g10/signal.c:1.21 gnupg/g10/signal.c:1.22
--- gnupg/g10/signal.c:1.21	Tue May 31 10:39:15 2005
+++ gnupg/g10/signal.c	Wed Jun  1 21:13:05 2005
@@ -1,6 +1,6 @@
 /* signal.c - signal handling
- * Copyright (C) 1998, 1999, 2000, 2001, 2003,
- *               2004 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ *               2005 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -40,13 +40,16 @@
 #include "main.h"
 #include "ttyio.h"
 
+#ifdef HAVE_DOSISH_SYSTEM
+void init_signals(void) {}
+void pause_on_sigusr(int which) {}
+#else
 static volatile int caught_fatal_sig = 0;
 static volatile int caught_sigusr1 = 0;
 
 static void
 init_one_signal (int sig, RETSIGTYPE (*handler)(int), int check_ign )
 {
-#ifndef HAVE_DOSISH_SYSTEM
 #if defined(HAVE_SIGACTION) && defined(HAVE_STRUCT_SIGACTION)
     struct sigaction oact, nact;
 
@@ -70,7 +73,6 @@
         signal (sig, SIG_IGN);
     }
 #endif
-#endif /*!HAVE_DOSISH_SYSTEM*/
 }
 
 static RETSIGTYPE
@@ -129,7 +131,6 @@
 void
 init_signals()
 {
-#ifndef HAVE_DOSISH_SYSTEM
     init_one_signal (SIGINT, got_fatal_signal, 1 );
     init_one_signal (SIGHUP, got_fatal_signal, 1 );
     init_one_signal (SIGTERM, got_fatal_signal, 1 );
@@ -137,14 +138,12 @@
     init_one_signal (SIGSEGV, got_fatal_signal, 1 );
     init_one_signal (SIGUSR1, got_usr_signal, 0 );
     init_one_signal (SIGPIPE, SIG_IGN, 0 );
-#endif
 }
 
 
 void
 pause_on_sigusr( int which )
 {
-#ifndef HAVE_DOSISH_SYSTEM
 #if defined(HAVE_SIGPROCMASK) && defined(HAVE_SIGSET_T)
     sigset_t mask, oldmask;
 
@@ -165,7 +164,6 @@
      caught_sigusr1 = 0;
      sigrelse(SIGUSR1);
 #endif /*! HAVE_SIGPROCMASK && HAVE_SIGSET_T */
-#endif
 }
 
 /* Disabled - see comment in tdbio.c:tdbio_begin_transaction() */
@@ -173,7 +171,6 @@
 static void
 do_block( int block )
 {
-#ifndef HAVE_DOSISH_SYSTEM
     static int is_blocked;
 #if defined(HAVE_SIGPROCMASK) && defined(HAVE_SIGSET_T)
     static sigset_t oldmask;
@@ -223,7 +220,6 @@
 	is_blocked = 0;
     }
 #endif /*! HAVE_SIGPROCMASK && HAVE_SIGSET_T */
-#endif /*HAVE_DOSISH_SYSTEM*/
 }
 
 void
@@ -238,3 +234,5 @@
     do_block(0);
 }
 #endif
+
+#endif /* !HAVE_DOSISH_SYSTEM */