summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2014-10-06 20:09:10 (GMT)
committerHolger Weiss <holger@zedat.fu-berlin.de>2014-10-06 20:09:10 (GMT)
commitf40fc650f7a49ed6445a8eddf2f1af435592ec7b (patch)
tree00d0b7ab4c3bf7d2caf8609a23be9a2336d739d5 /lib
parent3b02d7fafba6ef35cac9af47ce046f9c7a6fc510 (diff)
downloadmonitoring-plugins-f40fc650f7a49ed6445a8eddf2f1af435592ec7b.tar.gz
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].
Diffstat (limited to 'lib')
-rw-r--r--lib/utils_base.c6
1 files changed, 3 insertions, 3 deletions
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) {
477 this_state->state_data=NULL; 477 this_state->state_data=NULL;
478 478
479 /* Calculate filename */ 479 /* Calculate filename */
480 ret = xasprintf(&temp_filename, "%s/%lu/%s/%s", 480 ret = asprintf(&temp_filename, "%s/%lu/%s/%s",
481 _np_state_calculate_location_prefix(), (unsigned long)geteuid(), 481 _np_state_calculate_location_prefix(), (unsigned long)geteuid(),
482 this_monitoring_plugin->plugin_name, this_state->name); 482 this_monitoring_plugin->plugin_name, this_state->name);
483 if (ret < 0) 483 if (ret < 0)
@@ -619,7 +619,7 @@ void np_state_write_string(time_t data_time, char *data_string) {
619 619
620 /* If file doesn't currently exist, create directories */ 620 /* If file doesn't currently exist, create directories */
621 if(access(this_monitoring_plugin->state->_filename,F_OK)!=0) { 621 if(access(this_monitoring_plugin->state->_filename,F_OK)!=0) {
622 result = xasprintf(&directories, "%s", this_monitoring_plugin->state->_filename); 622 result = asprintf(&directories, "%s", this_monitoring_plugin->state->_filename);
623 if(result < 0) 623 if(result < 0)
624 die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), 624 die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
625 strerror(errno)); 625 strerror(errno));
@@ -638,7 +638,7 @@ void np_state_write_string(time_t data_time, char *data_string) {
638 np_free(directories); 638 np_free(directories);
639 } 639 }
640 640
641 result = xasprintf(&temp_file,"%s.XXXXXX",this_monitoring_plugin->state->_filename); 641 result = asprintf(&temp_file,"%s.XXXXXX",this_monitoring_plugin->state->_filename);
642 if(result < 0) 642 if(result < 0)
643 die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), 643 die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
644 strerror(errno)); 644 strerror(errno));