fixed compiler warnings issued by:

gcc 4.3
	curl.h gcc type-checking
	glibc with enabled FORTIFY_SOURCE checking
This commit is contained in:
Martin Willi
2008-11-11 18:37:19 +00:00
parent 3d2dbebd70
commit 479f295049
22 changed files with 125 additions and 59 deletions
+1 -1
View File
@@ -719,7 +719,7 @@ int main(int argc, char *argv[])
if (pid_file)
{
fprintf(pid_file, "%d\n", getpid());
fchown(fileno(pid_file), charon->uid, charon->gid);
ignore_result(fchown(fileno(pid_file), charon->uid, charon->gid));
fclose(pid_file);
}
+2
View File
@@ -17,6 +17,8 @@
#include "sql_attribute.h"
#include <time.h>
#include <daemon.h>
typedef struct private_sql_attribute_t private_sql_attribute_t;
+16 -4
View File
@@ -72,7 +72,10 @@ static void updown(ike_sa_t *ike_sa, child_sa_t *child_sa, bool up)
FILE *shell;
/* get subnet/bits from string */
asprintf(&my_client, "%R", my_ts);
if (asprintf(&my_client, "%R", my_ts) < 0)
{
my_client = NULL;
}
pos = strchr(my_client, '/');
*pos = '\0';
my_client_mask = pos + 1;
@@ -81,7 +84,10 @@ static void updown(ike_sa_t *ike_sa, child_sa_t *child_sa, bool up)
{
*pos = '\0';
}
asprintf(&other_client, "%R", other_ts);
if (asprintf(&other_client, "%R", other_ts) < 0)
{
other_client = NULL;
}
pos = strchr(other_client, '/');
*pos = '\0';
other_client_mask = pos + 1;
@@ -93,11 +99,17 @@ static void updown(ike_sa_t *ike_sa, child_sa_t *child_sa, bool up)
if (vip)
{
asprintf(&virtual_ip, "PLUTO_MY_SOURCEIP='%H' ", vip);
if (asprintf(&virtual_ip, "PLUTO_MY_SOURCEIP='%H' ", vip) < 0)
{
virtual_ip = NULL;
}
}
else
{
asprintf(&virtual_ip, "");
if (asprintf(&virtual_ip, "") < 0)
{
virtual_ip = NULL;
}
}
iface = charon->kernel_interface->get_interface(
+2 -2
View File
@@ -2176,7 +2176,7 @@ static void remove_dns_servers(private_ike_sa_t *this)
if (!found)
{
/* write line untouched back to file */
fwrite(orig_line.ptr, orig_line.len, 1, file);
ignore_result(fwrite(orig_line.ptr, orig_line.len, 1, file));
fprintf(file, "\n");
}
}
@@ -2230,7 +2230,7 @@ static void add_dns_server(private_ike_sa_t *this, host_t *dns)
{
this->dns_servers->insert_last(this->dns_servers, dns->clone(dns));
}
fwrite(contents.ptr, contents.len, 1, file);
ignore_result(fwrite(contents.ptr, contents.len, 1, file));
fclose(file);
}