diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-12-19 14:53:53 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-12-19 14:53:53 +0000 |
| commit | 98ba68dd39fa4ef3df0e987053791b754caaf619 (patch) | |
| tree | de72827dd7b4fe0c07cec72bdce90589bee25aa3 /include | |
| parent | c046047aa529f0b6c7db44ea78980ac6f6fd3bec (diff) | |
| download | zabbix-98ba68dd39fa4ef3df0e987053791b754caaf619.tar.gz zabbix-98ba68dd39fa4ef3df0e987053791b754caaf619.tar.xz zabbix-98ba68dd39fa4ef3df0e987053791b754caaf619.zip | |
Minor fixes.
git-svn-id: svn://svn.zabbix.com/trunk@3614 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 51 | ||||
| -rw-r--r-- | include/db.h | 6 |
2 files changed, 33 insertions, 24 deletions
diff --git a/include/common.h b/include/common.h index 5f79e35c..f4b3665c 100644 --- a/include/common.h +++ b/include/common.h @@ -94,22 +94,28 @@ #define MAX_BUF_LEN 65000 /* Item types */ -#define ITEM_TYPE_ZABBIX 0 -#define ITEM_TYPE_SNMPv1 1 -#define ITEM_TYPE_TRAPPER 2 -#define ITEM_TYPE_SIMPLE 3 -#define ITEM_TYPE_SNMPv2c 4 -#define ITEM_TYPE_INTERNAL 5 -#define ITEM_TYPE_SNMPv3 6 -#define ITEM_TYPE_ZABBIX_ACTIVE 7 -#define ITEM_TYPE_AGGREGATE 8 +typedef enum +{ + ITEM_TYPE_ZABBIX = 0, + ITEM_TYPE_SNMPv1, + ITEM_TYPE_TRAPPER, + ITEM_TYPE_SIMPLE, + ITEM_TYPE_SNMPv2c, + ITEM_TYPE_INTERNAL, + ITEM_TYPE_SNMPv3, + ITEM_TYPE_ZABBIX_ACTIVE, + ITEM_TYPE_AGGREGATE +} zbx_item_type_t; /* Item value types */ -#define ITEM_VALUE_TYPE_FLOAT 0 -#define ITEM_VALUE_TYPE_STR 1 -#define ITEM_VALUE_TYPE_LOG 2 -#define ITEM_VALUE_TYPE_UINT64 3 -#define ITEM_VALUE_TYPE_TEXT 4 +typedef enum +{ + ITEM_VALUE_TYPE_FLOAT = 0, + ITEM_VALUE_TYPE_STR, + ITEM_VALUE_TYPE_LOG, + ITEM_VALUE_TYPE_UINT64, + ITEM_VALUE_TYPE_TEXT +} zbx_item_value_type_t; /* Item snmpv3 security levels */ #define ITEM_SNMPV3_SECURITYLEVEL_NOAUTHNOPRIV 0 @@ -130,13 +136,16 @@ #define RECIPIENT_TYPE_GROUP 1 /* Condition types */ -#define CONDITION_TYPE_HOST_GROUP 0 -#define CONDITION_TYPE_HOST 1 -#define CONDITION_TYPE_TRIGGER 2 -#define CONDITION_TYPE_TRIGGER_NAME 3 -#define CONDITION_TYPE_TRIGGER_SEVERITY 4 -#define CONDITION_TYPE_TRIGGER_VALUE 5 -#define CONDITION_TYPE_TIME_PERIOD 6 +typedef enum +{ + CONDITION_TYPE_HOST_GROUP = 0, + CONDITION_TYPE_HOST, + CONDITION_TYPE_TRIGGER, + CONDITION_TYPE_TRIGGER_NAME, + CONDITION_TYPE_TRIGGER_SEVERITY, + CONDITION_TYPE_TRIGGER_VALUE, + CONDITION_TYPE_TIME_PERIOD +} zbx_condition_type_t; /* Condition operators */ #define CONDITION_OPERATOR_EQUAL 0 diff --git a/include/db.h b/include/db.h index 0a2f5d1e..bec230c4 100644 --- a/include/db.h +++ b/include/db.h @@ -229,7 +229,7 @@ DB_ITEM { zbx_uint64_t itemid; zbx_uint64_t hostid; - int type; + zbx_item_type_t type; int status; char *description; char key[ITEM_KEY_LEN_MAX]; @@ -259,7 +259,7 @@ DB_ITEM int prevvalue_null; time_t lastcheck; time_t nextcheck; - int value_type; + zbx_item_value_type_t value_type; int delta; int multiplier; char *units; @@ -347,7 +347,7 @@ DB_CONDITION { zbx_uint64_t conditionid; zbx_uint64_t actionid; - int conditiontype; + zbx_condition_type_t conditiontype; int operator; char *value; }; |