[Pcsclite-git-commit] [PCSC] 14/16: Remove useless PMRegisterForPowerEvents()

Ludovic Rousseau rousseau at moszumanska.debian.org
Thu May 11 16:26:04 UTC 2017


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

rousseau pushed a commit to branch master
in repository PCSC.

commit 6afb6cbfa029a3b52ef0b0e9b7f76b9c9d88dd18
Author: Ludovic Rousseau <ludovic.rousseau at free.fr>
Date:   Thu May 11 15:07:28 2017 +0200

    Remove useless PMRegisterForPowerEvents()
    
    Remove the complete powermgt_generic.[c,h] files.
    
    powermgt_macosx.c has been removed in April 2009
    in c199045d62e2255ec07d49becff4f94d67943676.
    
    Since then no power management was used in pcsc-lite.
---
 src/Makefile.am        |  2 --
 src/pcscdaemon.c       |  6 ------
 src/powermgt_generic.c | 54 --------------------------------------------------
 src/powermgt_generic.h | 44 ----------------------------------------
 4 files changed, 106 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 453d64d..29d699e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -59,8 +59,6 @@ pcscd_SOURCES = \
 	PCSC/pcsclite.h \
 	PCSC/winscard.h \
 	PCSC/wintypes.h \
-	powermgt_generic.c \
-	powermgt_generic.h \
 	prothandler.c \
 	prothandler.h \
 	readerfactory.c \
diff --git a/src/pcscdaemon.c b/src/pcscdaemon.c
index fc6e43c..8745a96 100644
--- a/src/pcscdaemon.c
+++ b/src/pcscdaemon.c
@@ -65,7 +65,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "hotplug.h"
 #include "readerfactory.h"
 #include "configfile.h"
-#include "powermgt_generic.h"
 #include "utils.h"
 #include "eventhandler.h"
 
@@ -749,11 +748,6 @@ int main(int argc, char **argv)
 	RFWaitForReaderInit();
 #endif
 
-	/*
-	 * Set up the power management callback routine
-	 */
-	(void)PMRegisterForPowerEvents();
-
 	/* initialisation succeeded */
 	if (pipefd[1] >= 0)
 	{
diff --git a/src/powermgt_generic.c b/src/powermgt_generic.c
deleted file mode 100644
index cb8a48f..0000000
--- a/src/powermgt_generic.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * MUSCLE SmartCard Development ( http://pcsclite.alioth.debian.org/pcsclite.html )
- *
- * Copyright (C) 2000-2003
- *  David Corcoran <corcoran at musclecard.com>
- * Copyright (C) 2003
- *  Antti Tapaninen
- * Copyright (C) 2004-2009
- *  Ludovic Rousseau <ludovic.rousseau at free.fr>
- *
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * @file
- * @brief This handles power management routines.
- */
-
-#include "config.h"
-#include "pcsclite.h"
-#include "powermgt_generic.h"
-
-/*
- * Check for platforms that have their own specific support.
- * It's more easy and flexible to do it here, rather than
- * with automake conditionals in src/Makefile.am.
- * No, it's still not a perfect solution design wise.
- */
-
-ULONG PMRegisterForPowerEvents(void)
-{
-  return 0;
-}
diff --git a/src/powermgt_generic.h b/src/powermgt_generic.h
deleted file mode 100644
index af07612..0000000
--- a/src/powermgt_generic.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * MUSCLE SmartCard Development ( http://pcsclite.alioth.debian.org/pcsclite.html )
- *
- * Copyright (C) 2002
- *  David Corcoran <corcoran at musclecard.com>
- *
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * @file
- * @brief This handles power management routines.
- */
-
-#ifndef __powermgt_generic_h__
-#define __powermgt_generic_h__
-
-/**
- * Registers for Power Management callbacks
- */
-ULONG PMRegisterForPowerEvents(void);
-
-#endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pcsclite/PCSC.git



More information about the Pcsclite-cvs-commit mailing list