From f40fc650f7a49ed6445a8eddf2f1af435592ec7b Mon Sep 17 00:00:00 2001
From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Mon, 6 Oct 2014 22:09:10 +0200
Subject: Revert "Make use of xasprintf instead of asprintf"

This reverts commit a143739ed286cf9ae003792dbb1ce26ce43f3312.

Our current setup doesn't allow lib/*.c files to call functions defined
in plugins/utils.[ch].

diff --git a/lib/utils_base.c b/lib/utils_base.c
index 4fb6375..3822bcf 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -477,7 +477,7 @@ void np_enable_state(char *keyname, int expected_data_version) {
 	this_state->state_data=NULL;
 
 	/* Calculate filename */
-	ret = xasprintf(&temp_filename, "%s/%lu/%s/%s",
+	ret = asprintf(&temp_filename, "%s/%lu/%s/%s",
 	    _np_state_calculate_location_prefix(), (unsigned long)geteuid(),
 	    this_monitoring_plugin->plugin_name, this_state->name);
 	if (ret < 0)
@@ -619,7 +619,7 @@ void np_state_write_string(time_t data_time, char *data_string) {
 	
 	/* If file doesn't currently exist, create directories */
 	if(access(this_monitoring_plugin->state->_filename,F_OK)!=0) {
-		result = xasprintf(&directories, "%s", this_monitoring_plugin->state->_filename);
+		result = asprintf(&directories, "%s", this_monitoring_plugin->state->_filename);
 		if(result < 0)
 			die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
 			    strerror(errno));
@@ -638,7 +638,7 @@ void np_state_write_string(time_t data_time, char *data_string) {
 		np_free(directories);
 	}
 
-	result = xasprintf(&temp_file,"%s.XXXXXX",this_monitoring_plugin->state->_filename);
+	result = asprintf(&temp_file,"%s.XXXXXX",this_monitoring_plugin->state->_filename);
 	if(result < 0)
 		die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
 		    strerror(errno));
-- 
cgit v0.10-9-g596f