[Pkg-gnupg-commit] [gnupg2] 277/292: dirmngr: More w32 system daemon cleanup

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit b3a917201207898059c048dd101344765201b03c
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Oct 31 20:33:02 2016 -0400

    dirmngr: More w32 system daemon cleanup
    
    * dirmngr/dirmngr.c (handle_tick): Remove w32 tests for
    shutdown_pending; no longer needed.
    
    --
    
    In d83ba4897bf217d1045c58d1b99e52bd31c58812, we removed the
    Windows-specific system daemon features, where shutdown_pending was
    set from w32_service_control().  shutdown_pending is now never
    assigned outside of handle_signal() or within an inotify test, neither
    of which are available on w32.
    
    As a result, this stanza in handle_tick() should be dead code, and can
    be removed to keep things simple.
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
    
    s/win32/w32/ to please RMS ;-)  -wk
---
 dirmngr/dirmngr.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index f5dce81..2a6729e 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -1842,20 +1842,6 @@ time_for_housekeeping_p (time_t curtime)
 static void
 handle_tick (void)
 {
-  /* Under Windows we don't use signals and need a way for the loop to
-     check for the shutdown flag.  */
-#ifdef HAVE_W32_SYSTEM
-  if (shutdown_pending)
-    log_info (_("SIGTERM received - shutting down ...\n"));
-  if (shutdown_pending > 2)
-    {
-      log_info (_("shutdown forced\n"));
-      log_info ("%s %s stopped\n", strusage(11), strusage(13) );
-      cleanup ();
-      dirmngr_exit (0);
-    }
-#endif /*HAVE_W32_SYSTEM*/
-
   if (time_for_housekeeping_p (gnupg_get_time ()))
     {
       npth_t thread;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git