Changeset 740 for vendor/current/lib/replace/getpass.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/lib/replace/getpass.c (modified) (5 diffs)

vendor/current/lib/replace/getpass.c ¶

@@ -35 +35 @@
 #endif
 
-#ifndef SIGNAL_CAST
-#define SIGNAL_CAST (RETSIGTYPE (*)(int))
-#endif
-
 #ifdef SYSV_TERMIO 
 
@@ -100 +96 @@
 #endif /* SYSV_TERMIO */
 
-static void catch_signal(int signum,void (*handler)(int ))
+static void catch_signal(int signum, void (*handler)(int ))
 {
 #ifdef HAVE_SIGACTION
@@ -132 +128 @@
 ****************************************************************/
 
-static void gotintr_sig(void)
+static void gotintr_sig(int signum)
 {
         gotintr = 1;
@@ -149 +145 @@
 
         /* Catch problematic signals */
-        catch_signal(SIGINT, SIGNAL_CAST gotintr_sig);
+        catch_signal(SIGINT, gotintr_sig);
 
         /* Try to write to and read from the terminal if we can.
@@ -212 +208 @@
 
         /* Catch problematic signals */
-        catch_signal(SIGINT, SIGNAL_CAST SIG_DFL);
+        catch_signal(SIGINT, SIG_DFL);
 
         if (gotintr) {
-                printf("Interupted by signal.\n");
+                printf("Interrupted by signal.\n");
                 fflush(stdout);
                 exit(1);