[PATCH] sanitize compiler warnings on size_t in common/macros.c

[Guest]

This is a multi-part message in MIME format.
--------------030709030002090704040803
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

and since i ran straight into that, small fixed compiler warning.

kind regards,
Michael

--
DI (FH) Michael Friedrich

Vienna University Computer Center
Universitaetsstrasse 7 A-1010 Vienna, Austria

email: [email protected]
phone: +43 1 4277 14359
fax: +43 1 4277 14338
web: http://www.univie.ac.at/zid
http://www.aco.net

Icinga Core& IDOUtils Developer
http://www.icinga.org


--------------030709030002090704040803
Content-Type: text/x-diff;
name="0001-sanitize-compiler-warnings-on-size_t-in-common-macro.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename*0="0001-sanitize-compiler-warnings-on-size_t-in-common-macro.pa";
filename*1="tch"

From c53189fbbad9e3f356d774b145fc03e11b95e9c8 Mon Sep 17 00:00:00 2001
From: Michael Friedrich
Date: Wed, 9 Feb 2011 16:47:27 +0100
Subject: [PATCH] sanitize compiler warnings on size_t in common/macros.c

---
common/macros.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/macros.c b/common/macros.c
index fda90e1..d19b4b1 100644
--- a/common/macros.c
+++ b/common/macros.c
@@ -146,7 +146,7 @@ int process_macros_r(nagios_macros *mac, char *input_buffer, char **output_buffe
*output_buffer=(char *)realloc(*output_buffer,strlen(*output_buffer)+strlen(temp_buffer)+1);
strcat(*output_buffer,temp_buffer);

- log_debug_info(DEBUGL_MACROS,2," Not currently in macro. Running output (%d): '%s'\n",strlen(*output_buffer),*output_buffer);
+ log_debug_info(DEBUGL_MACROS,2," Not currently in macro. Running output (%lu): '%s'\n",(unsigned long)strlen(*output_buffer),*output_buffer);
in_macro=TRUE;
}

@@ -173,14 +173,14 @@ int process_macros_r(nagios_macros *mac, char *input_buffer, char **output_buffe

/* an escaped $ is done by specifying two $$ next to each other */
else if(!strcmp(temp_buffer,"")){
- log_debug_info(DEBUGL_MACROS,2," Escaped $. Running output (%d): '%s'\n",strlen(*output_buffer),*output_buffer);
+ log_debug_info(DEBUGL_MACROS,2," Escaped $. Running output (%lu): '%s'\n",(unsigned long)strlen(*output_buffer),*output_buffer);
*output_buffer=(char *)realloc(*output_buffer,strlen(*output_buffer)+2);
strcat(*output_buffer,"$");
}

/* a non-macro, just some user-defined string between two $s */
else{
- log_debug_info(DEBUGL_MACROS,2," Non-macro. Running output (%d): '%s'\n",strlen(*output_buffer),*output_buffer);
+ log_debug_info(DEBUGL_MACROS,2," Non-macro. Running output (%lu): '%s'\n",(unsigned long)strlen(*output_buffer),*output_buffer);

/* add the plain text to the end of the already processed buffer */
*output_buffer=(char *)realloc(*output_buffer,strlen(*output_buffer)+strlen(temp_buffer)+3);
@@ -216,7 +216,7 @@ int process_macros_r(nagios_macros *mac, char *input_buffer, char **output_buffe
*output_buffer=(char *)realloc(*output_buffer,strlen(*output_buffer)+strlen(cleaned_macro)+1);
strcat(*output_buffer,cleaned_macro);

- log_debug_info(DEBUGL_MACROS,2," Cleaned macro. Running output (%d): '%s'\n",strlen(*output_buffer),*output_buffer);
+ log_debug_info(DEBUGL_MACROS,2," Cleaned macro. Running output (%lu): '%s'\n",(unsigned long)strlen(*output_buffer),*output_buffer);
}
}

@@ -227,7 +227,7 @@ int process_macros_r(nagios_macros *mac, char *input_buffer, char **output_buffe
*output_buffer=(char *)realloc(*output_buffer,strlen(*output_buffer)+strlen(selected_macro)+1);
strcat(*output_buffer,selected_macro);

- log_debug_info(DEBUGL_MACROS,2," Uncleaned macro. Running output (%d): '%s'\n",strlen(*output_buffer),*output_buffer);
+ log_debug_info(DEBUGL_MACROS,2," Uncleaned macro. Running output (%lu): '%s'\n",(unsigned long)strlen(*output_buffer),*output_buffer);
}
}

@@ -235,7 +235,7 @@ int process_macros_r(nagios_macros *mac, char *input_buffer, char **output_buffe
if(free_macro==TRUE)
my_free(selected_macro);

- log_debug_info(DEBU

...[email truncated]...


This post was automatically imported from historical nagios-devel mailing list archives
Original poster: [email protected]