|
|
27639a |
diff -up pptp-1.7.2/pptp_ctrl.c.prototype pptp-1.7.2/pptp_ctrl.c
|
|
|
27639a |
--- pptp-1.7.2/pptp_ctrl.c.prototype 2011-12-06 16:41:47.391574067 +0000
|
|
|
27639a |
+++ pptp-1.7.2/pptp_ctrl.c 2011-12-06 16:41:47.405574074 +0000
|
|
|
27639a |
@@ -174,7 +174,7 @@ int max_echo_wait = PPTP_TIMEOUT;
|
|
|
27639a |
|
|
|
27639a |
/* Local prototypes */
|
|
|
27639a |
static void pptp_reset_timer(void);
|
|
|
27639a |
-static void pptp_handle_timer();
|
|
|
27639a |
+static void pptp_handle_timer(void);
|
|
|
27639a |
/* Write/read as much as we can without blocking. */
|
|
|
27639a |
int pptp_write_some(PPTP_CONN * conn);
|
|
|
27639a |
int pptp_read_some(PPTP_CONN * conn);
|
|
|
27639a |
@@ -1059,7 +1059,7 @@ static void pptp_reset_timer(void)
|
|
|
27639a |
|
|
|
27639a |
|
|
|
27639a |
/*** Handle keep-alive timer **************************************************/
|
|
|
27639a |
-static void pptp_handle_timer()
|
|
|
27639a |
+static void pptp_handle_timer(void)
|
|
|
27639a |
{
|
|
|
27639a |
int i;
|
|
|
27639a |
/* "Keep Alives and Timers, 1": check connection state */
|
|
|
27639a |
diff -up pptp-1.7.2/pptp_gre.c.prototype pptp-1.7.2/pptp_gre.c
|
|
|
27639a |
--- pptp-1.7.2/pptp_gre.c.prototype 2011-12-06 16:41:47.392574067 +0000
|
|
|
27639a |
+++ pptp-1.7.2/pptp_gre.c 2011-12-06 16:45:34.605691678 +0000
|
|
|
27639a |
@@ -71,7 +71,7 @@ void print_packet(int fd, void *pack, un
|
|
|
27639a |
#endif
|
|
|
27639a |
|
|
|
27639a |
/*** time_now_usecs ***********************************************************/
|
|
|
27639a |
-uint64_t time_now_usecs()
|
|
|
27639a |
+uint64_t time_now_usecs(void)
|
|
|
27639a |
{
|
|
|
27639a |
struct timeval tv;
|
|
|
27639a |
gettimeofday(&tv, NULL);
|
|
|
27639a |
diff -up pptp-1.7.2/pptp_quirks.c.prototype pptp-1.7.2/pptp_quirks.c
|
|
|
27639a |
--- pptp-1.7.2/pptp_quirks.c.prototype 2008-05-14 07:33:55.000000000 +0100
|
|
|
27639a |
+++ pptp-1.7.2/pptp_quirks.c 2011-12-06 16:41:47.405574074 +0000
|
|
|
27639a |
@@ -30,7 +30,7 @@ int set_quirk_index(int index)
|
|
|
27639a |
return -1;
|
|
|
27639a |
}
|
|
|
27639a |
|
|
|
27639a |
-int get_quirk_index()
|
|
|
27639a |
+int get_quirk_index(void)
|
|
|
27639a |
{
|
|
|
27639a |
return quirk_index;
|
|
|
27639a |
}
|
|
|
27639a |
diff -up pptp-1.7.2/pptp_quirks.h.prototype pptp-1.7.2/pptp_quirks.h
|
|
|
27639a |
--- pptp-1.7.2/pptp_quirks.h.prototype 2008-05-14 07:33:55.000000000 +0100
|
|
|
27639a |
+++ pptp-1.7.2/pptp_quirks.h 2011-12-06 16:41:47.406574074 +0000
|
|
|
27639a |
@@ -53,7 +53,7 @@ int set_quirk_index(int index);
|
|
|
27639a |
|
|
|
27639a |
/* get the global quirk index. return the index on success,
|
|
|
27639a |
-1 if no quirk is defined */
|
|
|
27639a |
-int get_quirk_index();
|
|
|
27639a |
+int get_quirk_index(void);
|
|
|
27639a |
|
|
|
27639a |
|
|
|
27639a |
#endif /* INC_PPTP_QUIRKS_H */
|
|
|
27639a |
diff -up pptp-1.7.2/pqueue.c.prototype pptp-1.7.2/pqueue.c
|
|
|
27639a |
--- pptp-1.7.2/pqueue.c.prototype 2011-12-06 16:41:47.392574067 +0000
|
|
|
27639a |
+++ pptp-1.7.2/pqueue.c 2011-12-06 16:41:47.406574074 +0000
|
|
|
27639a |
@@ -217,7 +217,7 @@ int pqueue_del (pqueue_t *point) {
|
|
|
27639a |
|
|
|
27639a |
|
|
|
27639a |
|
|
|
27639a |
-pqueue_t *pqueue_head () {
|
|
|
27639a |
+pqueue_t *pqueue_head (void) {
|
|
|
27639a |
return pq_head;
|
|
|
27639a |
}
|
|
|
27639a |
|
|
|
27639a |
diff -up pptp-1.7.2/pqueue.h.prototype pptp-1.7.2/pqueue.h
|
|
|
27639a |
--- pptp-1.7.2/pqueue.h.prototype 2011-12-06 16:41:47.392574067 +0000
|
|
|
27639a |
+++ pptp-1.7.2/pqueue.h 2011-12-06 16:41:47.407574075 +0000
|
|
|
27639a |
@@ -24,7 +24,7 @@ typedef struct pqueue {
|
|
|
27639a |
|
|
|
27639a |
int pqueue_add (u_int32_t seq, unsigned char *packet, int packlen);
|
|
|
27639a |
int pqueue_del (pqueue_t *point);
|
|
|
27639a |
-pqueue_t *pqueue_head ();
|
|
|
27639a |
+pqueue_t *pqueue_head (void);
|
|
|
27639a |
int pqueue_expiry_time (pqueue_t *entry);
|
|
|
27639a |
|
|
|
27639a |
#endif /* PQUEUE_H */
|
|
|
27639a |
diff -up pptp-1.7.2/routing.c.prototype pptp-1.7.2/routing.c
|
|
|
27639a |
--- pptp-1.7.2/routing.c.prototype 2011-12-06 16:41:47.388574065 +0000
|
|
|
27639a |
+++ pptp-1.7.2/routing.c 2011-12-06 16:41:47.407574075 +0000
|
|
|
27639a |
@@ -123,7 +123,7 @@ void routing_init(char *ip) {
|
|
|
27639a |
#endif /* Solaris */
|
|
|
27639a |
}
|
|
|
27639a |
|
|
|
27639a |
-void routing_start() {
|
|
|
27639a |
+void routing_start(void) {
|
|
|
27639a |
#if defined (__SVR4) && defined (__sun) /* Solaris */
|
|
|
27639a |
if ( ! dorouting )
|
|
|
27639a |
return;
|
|
|
27639a |
@@ -153,7 +153,7 @@ void routing_start() {
|
|
|
27639a |
#endif /* Solaris */
|
|
|
27639a |
}
|
|
|
27639a |
|
|
|
27639a |
-void routing_end() {
|
|
|
27639a |
+void routing_end(void) {
|
|
|
27639a |
#if defined (__SVR4) && defined (__sun) /* Solaris */
|
|
|
27639a |
if ( ! dorouting)
|
|
|
27639a |
return;
|
|
|
27639a |
diff -up pptp-1.7.2/routing.h.prototype pptp-1.7.2/routing.h
|
|
|
27639a |
--- pptp-1.7.2/routing.h.prototype 2008-05-14 07:33:55.000000000 +0100
|
|
|
27639a |
+++ pptp-1.7.2/routing.h 2011-12-06 16:41:47.407574075 +0000
|
|
|
27639a |
@@ -1,3 +1,3 @@
|
|
|
27639a |
void routing_init(char *ip);
|
|
|
27639a |
-void routing_start();
|
|
|
27639a |
-void routing_end();
|
|
|
27639a |
+void routing_start(void);
|
|
|
27639a |
+void routing_end(void);
|
|
|
27639a |
diff -up pptp-1.7.2/test.c.prototype pptp-1.7.2/test.c
|
|
|
27639a |
--- pptp-1.7.2/test.c.prototype 2011-12-06 16:41:47.393574067 +0000
|
|
|
27639a |
+++ pptp-1.7.2/test.c 2011-12-06 16:41:47.408574076 +0000
|
|
|
27639a |
@@ -171,7 +171,7 @@ static ssize_t write_reordered(int fd, c
|
|
|
27639a |
}
|
|
|
27639a |
}
|
|
|
27639a |
|
|
|
27639a |
-struct test_redirections *test_redirections()
|
|
|
27639a |
+struct test_redirections *test_redirections(void)
|
|
|
27639a |
{
|
|
|
27639a |
static struct test_redirections *my = NULL;
|
|
|
27639a |
|
|
|
27639a |
diff -up pptp-1.7.2/test.h.prototype pptp-1.7.2/test.h
|
|
|
27639a |
--- pptp-1.7.2/test.h.prototype 2008-05-14 07:33:55.000000000 +0100
|
|
|
27639a |
+++ pptp-1.7.2/test.h 2011-12-06 16:41:47.408574076 +0000
|
|
|
27639a |
@@ -2,4 +2,4 @@ struct test_redirections {
|
|
|
27639a |
ssize_t (*write)(int fd, const void *buf, size_t count);
|
|
|
27639a |
};
|
|
|
27639a |
|
|
|
27639a |
-struct test_redirections *test_redirections();
|
|
|
27639a |
+struct test_redirections *test_redirections(void);
|
|
|
27639a |
diff -up pptp-1.7.2/util.c.prototype pptp-1.7.2/util.c
|
|
|
27639a |
--- pptp-1.7.2/util.c.prototype 2011-12-06 16:41:47.396574070 +0000
|
|
|
27639a |
+++ pptp-1.7.2/util.c 2011-12-06 16:41:47.409574076 +0000
|
|
|
27639a |
@@ -87,7 +87,7 @@ int file2fd(const char *path, const char
|
|
|
27639a |
static int sigpipe[2];
|
|
|
27639a |
|
|
|
27639a |
/* create a signal pipe, returns 0 for success, -1 with errno for failure */
|
|
|
27639a |
-int sigpipe_create()
|
|
|
27639a |
+int sigpipe_create(void)
|
|
|
27639a |
{
|
|
|
27639a |
int rc;
|
|
|
27639a |
|
|
|
27639a |
@@ -133,20 +133,20 @@ void sigpipe_assign(int signum)
|
|
|
27639a |
}
|
|
|
27639a |
|
|
|
27639a |
/* return the signal pipe read file descriptor for select(2) */
|
|
|
27639a |
-int sigpipe_fd()
|
|
|
27639a |
+int sigpipe_fd(void)
|
|
|
27639a |
{
|
|
|
27639a |
return sigpipe[0];
|
|
|
27639a |
}
|
|
|
27639a |
|
|
|
27639a |
/* read and return the pending signal from the pipe */
|
|
|
27639a |
-int sigpipe_read()
|
|
|
27639a |
+int sigpipe_read(void)
|
|
|
27639a |
{
|
|
|
27639a |
int signum;
|
|
|
27639a |
read(sigpipe[0], &signum, sizeof(signum));
|
|
|
27639a |
return signum;
|
|
|
27639a |
}
|
|
|
27639a |
|
|
|
27639a |
-void sigpipe_close()
|
|
|
27639a |
+void sigpipe_close(void)
|
|
|
27639a |
{
|
|
|
27639a |
close(sigpipe[0]);
|
|
|
27639a |
close(sigpipe[1]);
|
|
|
27639a |
diff -up pptp-1.7.2/util.h.prototype pptp-1.7.2/util.h
|
|
|
27639a |
--- pptp-1.7.2/util.h.prototype 2011-12-06 16:41:47.396574070 +0000
|
|
|
27639a |
+++ pptp-1.7.2/util.h 2011-12-06 16:41:47.409574076 +0000
|
|
|
27639a |
@@ -35,7 +35,7 @@ int file2fd(const char *path, const char
|
|
|
27639a |
/* signal to pipe delivery implementation */
|
|
|
27639a |
|
|
|
27639a |
/* create a signal pipe, returns 0 for success, -1 with errno for failure */
|
|
|
27639a |
-int sigpipe_create();
|
|
|
27639a |
+int sigpipe_create(void);
|
|
|
27639a |
|
|
|
27639a |
/* generic handler for signals, writes signal number to pipe */
|
|
|
27639a |
void sigpipe_handler(int signum);
|
|
|
27639a |
@@ -44,11 +44,11 @@ void sigpipe_handler(int signum);
|
|
|
27639a |
void sigpipe_assign(int signum);
|
|
|
27639a |
|
|
|
27639a |
/* return the signal pipe read file descriptor for select(2) */
|
|
|
27639a |
-int sigpipe_fd();
|
|
|
27639a |
+int sigpipe_fd(void);
|
|
|
27639a |
|
|
|
27639a |
/* read and return the pending signal from the pipe */
|
|
|
27639a |
-int sigpipe_read();
|
|
|
27639a |
+int sigpipe_read(void);
|
|
|
27639a |
|
|
|
27639a |
-void sigpipe_close();
|
|
|
27639a |
+void sigpipe_close(void);
|
|
|
27639a |
|
|
|
27639a |
#endif /* INC_UTIL_H */
|
|
|
27639a |
diff -up pptp-1.7.2/vector.c.prototype pptp-1.7.2/vector.c
|
|
|
27639a |
--- pptp-1.7.2/vector.c.prototype 2008-05-14 07:33:55.000000000 +0100
|
|
|
27639a |
+++ pptp-1.7.2/vector.c 2011-12-06 16:41:47.409574076 +0000
|
|
|
27639a |
@@ -35,7 +35,7 @@ struct vector_struct {
|
|
|
27639a |
static struct vector_item *binary_search(VECTOR *v, int key);
|
|
|
27639a |
|
|
|
27639a |
/*** vector_create ************************************************************/
|
|
|
27639a |
-VECTOR *vector_create()
|
|
|
27639a |
+VECTOR *vector_create(void)
|
|
|
27639a |
{
|
|
|
27639a |
const int INITIAL_SIZE = 4;
|
|
|
27639a |
|
|
|
27639a |
diff -up pptp-1.7.2/vector.h.prototype pptp-1.7.2/vector.h
|
|
|
27639a |
--- pptp-1.7.2/vector.h.prototype 2008-05-14 07:33:55.000000000 +0100
|
|
|
27639a |
+++ pptp-1.7.2/vector.h 2011-12-06 16:41:47.410574077 +0000
|
|
|
27639a |
@@ -12,7 +12,7 @@
|
|
|
27639a |
|
|
|
27639a |
typedef struct vector_struct VECTOR;
|
|
|
27639a |
|
|
|
27639a |
-VECTOR *vector_create();
|
|
|
27639a |
+VECTOR *vector_create(void);
|
|
|
27639a |
void vector_destroy(VECTOR *v);
|
|
|
27639a |
|
|
|
27639a |
int vector_size(VECTOR *v);
|