summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert James Kaes <rjkaes@users.sourceforge.net>2003-05-30 16:22:30 +0000
committerRobert James Kaes <rjkaes@users.sourceforge.net>2003-05-30 16:22:30 +0000
commitaf5e1e29f60c5344825cb0f59a9ea7ee2cb501ea (patch)
treee2fce4b312af8b427218f578803149c257c6358a
parent1955dcd47b956da220497c9818c67a8ca58cca35 (diff)
downloadtinyproxy-af5e1e29f60c5344825cb0f59a9ea7ee2cb501ea.tar.gz
tinyproxy-af5e1e29f60c5344825cb0f59a9ea7ee2cb501ea.zip
# Changed the calls to vector_getentry() to use the new calling
convention.
-rw-r--r--src/log.c4
-rw-r--r--src/reqs.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/src/log.c b/src/log.c
index b19afca..f1c16d1 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1,4 +1,4 @@
-/* $Id: log.c,v 1.24 2003-05-29 20:48:25 rjkaes Exp $
+/* $Id: log.c,v 1.25 2003-05-30 16:22:30 rjkaes Exp $
*
* Logs the various messages which tinyproxy produces to either a log file or
* the syslog daemon. Not much to it...
@@ -202,7 +202,7 @@ send_stored_logs(void)
int i;
for (i = 0; i < vector_length(log_message_storage); ++i) {
- vector_getentry(log_message_storage, i, (void **)&string);
+ string = vector_getentry(log_message_storage, i, NULL);
ptr = strchr(string, ' ') + 1;
level = atoi(string);
diff --git a/src/reqs.c b/src/reqs.c
index f7b5567..e4843d3 100644
--- a/src/reqs.c
+++ b/src/reqs.c
@@ -1,4 +1,4 @@
-/* $Id: reqs.c,v 1.99 2003-05-29 20:48:25 rjkaes Exp $
+/* $Id: reqs.c,v 1.100 2003-05-30 16:22:30 rjkaes Exp $
*
* This is where all the work in tinyproxy is actually done. Incoming
* connections have a new child created for them. The child then
@@ -128,7 +128,8 @@ check_allowed_connect_ports(int port)
return 1;
for (i = 0; i < vector_length(ports_allowed_by_connect); ++i) {
- if (vector_getentry(ports_allowed_by_connect, i, (void **)&data) < 0)
+ data = vector_getentry(ports_allowed_by_connect, i, NULL);
+ if (!data)
return -1;
if (*data == port)