File turnpike-prototypes.patch of Package turnpike
--- VPNClient/CommonUI/plog.c
+++ VPNClient/CommonUI/plog.c
@@ -95,9 +95,7 @@
struct log *
-log_open(siz, fname)
- size_t siz;
- char *fname;
+log_open( size_t siz, char *fname)
{
struct log *p;
@@ -220,7 +218,7 @@
void
-ploginit()
+ploginit(void)
{
if (logfile) {
logp = log_open(250, logfile);
@@ -233,8 +231,7 @@
}
void
-plogset(file)
- char *file;
+plogset(char *file)
{
if (logfile != NULL)
free(logfile);
--- VPNClient/CommonUI/vpncExtCert.c
+++ VPNClient/CommonUI/vpncExtCert.c
@@ -54,7 +54,7 @@
return ret;
}
-static int FcloseAll()
+static int FcloseAll(void)
{
Fclose(fpx);
Fclose(fpp);
@@ -326,7 +326,7 @@
#ifdef __DEBUG__
fprintf(stderr, "Error retrieving X509 certificate\n");
#endif
- FcloseAll(fpc);
+ FcloseAll();
EVP_PBE_cleanup();
return VPNC_ERR_DCRT_RTRCERT;
}
--- VPNClient/vpnc/include/profile.h
+++ VPNClient/vpnc/include/profile.h
@@ -83,7 +83,7 @@
int displayProfileList(void);
int getGatewayType();
//int getGatewayAddress(char *file);
-int getCertificateNameFromProfile();
+int getCertificateNameFromProfile(void);
//int printf_ph1Config_to_racoon_conf(FILE *fp);
//int printf_ph2Config_to_racoon_conf(FILE *fp);
--- VPNClient/vpnc/include/utility.h
+++ VPNClient/vpnc/include/utility.h
@@ -52,9 +52,9 @@
void get_connect_client_event_poll_sock (char*);
void printing_function(char*);
void handle_sigint(int );
-int connectHandler();
+int connectHandler(void);
int disconnectHandler(int );
-int getGatewayAddress();
+int getGatewayAddress(boolean_t);
int create_cp(void **);
int getVendorProfileName(char *);
int isProfileExist();
--- VPNClient/vpnc/src/commandHandler.c
+++ VPNClient/vpnc/src/commandHandler.c
@@ -41,7 +41,7 @@
extern char* errString(int, char*);
extern int displayProfileList(void);
extern void usage(void);
-extern int connectHandler();
+extern int connectHandler(void);
extern int getVendorProfileName(char *file);
extern int isProfileExist(char *file);
extern int disconnectHandler(int);
@@ -190,7 +190,7 @@
case CONNECT | PFSGROUP:
case CONNECT | DHGROUP | PFSGROUP:
case CONNECT | DHGROUP | PFSGROUP | UPSCRIPT:
- if(connectHandler(&Inf)<0)
+ if(connectHandler()<0)
return -1;
break;
--- VPNClient/vpnc/src/utility.c
+++ VPNClient/vpnc/src/utility.c
@@ -48,12 +48,12 @@
#include <libxml/parser.h>
#include <libxml/tree.h>
/* cli headers */
+#include "CommonUI.h"
#include "utility.h"
#include "vpncErrorHandling.h"
#include "cliErrors.h"
#include "commoncli.h"
#include "getip.h"
-#include "CommonUI.h"
#include "racoonconf.h"
/* Racoon Headers */
#include "racoon/admin.h"
@@ -64,8 +64,9 @@
extern char errStr[];
char PLOG_FILE[MAX_STRING_LEN] = { '\0' };
extern char* errString(int, char*);
-extern int getCertificateNameFromProfile();
-extern int getGatewayType();
+extern int getCertificateNameFromProfile(void);
+extern int getGatewayType(void);
+extern int getGatewayAddress(boolean_t);
extern int vpnExtCerts(const char *pfxFilePath, const char *password);
extern int loadmodule(const char *file_name);
@@ -227,7 +228,7 @@
/*********************Condition start*******************/
if(Inf.withProfileFile)
{
- if(getCertificateNameFromProfile(Inf.profileName)<0)
+ if(getCertificateNameFromProfile()<0)
{
fprintf (stderr, errString (BAD_PROFILE,errStr),Inf.profileName);
exit(1);
@@ -399,7 +400,7 @@
{
if(Inf.withProfileFile)
{
- if(getCertificateNameFromProfile(Inf.profileName)<0)
+ if(getCertificateNameFromProfile()<0)
{
fprintf (stderr, errString (BAD_PROFILE,errStr),Inf.profileName);
exit(1);