Changed the tests on the return value from malloc_shared_memory() to make tinyproxy more portable, since we can't be certain that "if (!ret_value)" would actually detect a mmap() error.

2 files changed, 5 insertions, 5 deletions

diff --git a/src/child.c b/src/child.c
index 9ac74e4..9b5bf33 100644
--- a/src/child.c
+++ b/src/child.c
@@ -1,4 +1,4 @@
-/* $Id: child.c,v 1.1 2002-05-26 18:45:26 rjkaes Exp $
+/* $Id: child.c,v 1.2 2002-05-29 20:49:55 rjkaes Exp $
  *
  * Handles the creation/destruction of the various children required for
  * processing incoming connections.
@@ -269,14 +269,14 @@ child_pool_create(void)
 	}
 
 	child_ptr = calloc_shared_memory(child_config.maxclients,
-					  sizeof(struct child_s));
+					 sizeof(struct child_s));
 	if (!child_ptr) {
 		log_message(LOG_ERR, "Could not allocate memory for children.");
 		return -1;
 	}
 
 	servers_waiting = malloc_shared_memory(sizeof(int));
-	if (!servers_waiting) {
+	if (servers_waiting == MAP_FAILED) {
 		log_message(LOG_ERR, "Could not allocate memory for child counting.");
 		return -1;
 	}
diff --git a/src/stats.c b/src/stats.c
index 2c5c774..e55f339 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -1,4 +1,4 @@
-/* $Id: stats.c,v 1.11 2002-05-29 17:31:01 rjkaes Exp $
+/* $Id: stats.c,v 1.12 2002-05-29 20:49:55 rjkaes Exp $
  *
  * This module handles the statistics for tinyproxy. There are only two
  * public API functions. The reason for the functions, rather than just a
@@ -45,7 +45,7 @@ void
 init_stats(void)
 {
 	stats = malloc_shared_memory(sizeof(struct stat_s));
-	if (!stats)
+	if (stats == MAP_FAILED)
 		return;
 
 	memset(stats, 0, sizeof(struct stat));