diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-08-09 09:34:47 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-08-09 09:34:47 +0000 |
| commit | dd6e2bc623c75f9084237d3c55f6a75bebac647b (patch) | |
| tree | 935fe7a0ee708845674c156b02e57c7439c19d96 | |
| parent | 2f4bd1aea13341a00f82ff011781dcceee79953d (diff) | |
| download | zabbix-dd6e2bc623c75f9084237d3c55f6a75bebac647b.tar.gz zabbix-dd6e2bc623c75f9084237d3c55f6a75bebac647b.tar.xz zabbix-dd6e2bc623c75f9084237d3c55f6a75bebac647b.zip | |
- [DEV-137] Misc bugs and improvements
[minor updates]
git-svn-id: svn://svn.zabbix.com/trunk@5889 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | src/libs/zbxdbcache/dbcache.c | 2 | ||||
| -rw-r--r-- | src/libs/zbxserver/expression.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/libs/zbxdbcache/dbcache.c b/src/libs/zbxdbcache/dbcache.c index 024d1d0c..98785742 100644 --- a/src/libs/zbxdbcache/dbcache.c +++ b/src/libs/zbxdbcache/dbcache.c @@ -1938,7 +1938,7 @@ lbl_create: } else { - zabbix_log(LOG_LEVEL_CRIT, "Can't allocate shared memory for collector. [%s]",strerror(errno)); + zabbix_log(LOG_LEVEL_CRIT, "Can't allocate shared memory for database cache. [%s]",strerror(errno)); exit(1); } } diff --git a/src/libs/zbxserver/expression.c b/src/libs/zbxserver/expression.c index ae528753..8ef9cdcc 100644 --- a/src/libs/zbxserver/expression.c +++ b/src/libs/zbxserver/expression.c @@ -805,13 +805,11 @@ void substitute_simple_macros(DB_EVENT *event, DB_ACTION *action, char **data, i zabbix_log(LOG_LEVEL_DEBUG, "In substitute_simple_macros()"); - if(!data || !*data) return; + if (NULL == data || '\0' == *data) return; zabbix_log(LOG_LEVEL_DEBUG, "In substitute_simple_macros (data:%s)", *data); - if('\0' == *data[0]) return; - if ( macro_type & MACRO_TYPE_TRIGGER_DESCRIPTION ) { expand_trigger_description_constants(data, event->objectid); } |