Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksandrs Saveljevs <git-no-reply@zabbix.com>2010-03-23 14:07:28 +0300
committerAleksandrs Saveljevs <git-no-reply@zabbix.com>2010-03-23 14:07:28 +0300
commitc7b3343284b5ed83864be0e4f9331fd550270b71 (patch)
tree8dabff224808627c8f7a51b2b087ba8948ba5d8e /include
parentbb8758f0b9ed8761a34d2cc0d90011fe2929101b (diff)
- fixed typos and removed // comments
[svn merge svn://svn.zabbix.com/branches/1.8 -r 11008:11017]
Diffstat (limited to 'include')
-rw-r--r--include/common.h2
-rw-r--r--include/dbcache.h2
-rw-r--r--include/perfmon.h18
-rw-r--r--include/threads.h6
4 files changed, 14 insertions, 14 deletions
diff --git a/include/common.h b/include/common.h
index 358ae0d26fb..bc6b9308db9 100644
--- a/include/common.h
+++ b/include/common.h
@@ -901,7 +901,7 @@ int get_nearestindex(void *p, size_t sz, int num, zbx_uint64_t id);
int uint64_array_add(zbx_uint64_t **values, int *alloc, int *num, zbx_uint64_t value, int alloc_step);
void uint64_array_merge(zbx_uint64_t **values, int *alloc, int *num, zbx_uint64_t *value, int value_num, int alloc_step);
int uint64_array_exists(zbx_uint64_t *values, int num, zbx_uint64_t value);
-void uint64_array_rm(zbx_uint64_t *values, int *num, zbx_uint64_t *rm_values, int rm_num);
+void uint64_array_remove(zbx_uint64_t *values, int *num, zbx_uint64_t *rm_values, int rm_num);
#ifdef _WINDOWS
LPTSTR zbx_acp_to_unicode(LPCSTR acp_string);
diff --git a/include/dbcache.h b/include/dbcache.h
index 24847230ca2..522595556d3 100644
--- a/include/dbcache.h
+++ b/include/dbcache.h
@@ -229,7 +229,7 @@ zbx_uint64_t DCget_nextid(const char *table_name, const char *field_name, int nu
int DCget_item_lastclock(zbx_uint64_t itemid);
-void DCsync_confguration();
+void DCsync_configuration();
void init_configuration_cache();
void free_configuration_cache();
diff --git a/include/perfmon.h b/include/perfmon.h
index 502502758ad..4828705e00f 100644
--- a/include/perfmon.h
+++ b/include/perfmon.h
@@ -24,9 +24,9 @@
# error "This module allowed only for Windows OS"
#endif /* _WINDOWS */
-//
-// Performance Counter Indexes
-//
+/*
+ * Performance Counter Indexes
+ */
#define PCI_SYSTEM (2)
#define PCI_PROCESSOR (238)
@@ -36,18 +36,18 @@
#define PCI_TERMINAL_SERVICES (2176)
#define PCI_TOTAL_SESSIONS (2178)
-//
-// Performance Countername structure
-//
+/*
+ * Performance Countername structure
+ */
struct perfcounter
{
struct perfcounter *next;
unsigned long pdhIndex;
TCHAR name[PDH_MAX_COUNTER_NAME];
- /* must be caracter array! if you want to rewrite */
- /* to dinacal memory allocation CHECK for usage */
- /* of sizeof function */
+ /* must be character array! if you want to rewrite */
+ /* to use dynamic memory allocation CHECK for usage */
+ /* of sizeof function */
};
typedef struct perfcounter PERFCOUNTER;
diff --git a/include/threads.h b/include/threads.h
index d6cec034b13..6c7c7882296 100644
--- a/include/threads.h
+++ b/include/threads.h
@@ -34,7 +34,7 @@
#define ZBX_THREAD_ENTRY(entry_name, arg_name) \
unsigned __stdcall entry_name (void * arg_name)
- #define zbx_tread_exit(status) \
+ #define zbx_thread_exit(status) \
_endthreadex((unsigned int)(status)); \
return ((unsigned)(status))
@@ -56,7 +56,7 @@
#define ZBX_THREAD_ENTRY(entry_name, arg_name) \
unsigned entry_name (void * arg_name )
- #define zbx_tread_exit(status) \
+ #define zbx_thread_exit(status) \
exit((int)(status)); \
return ((unsigned)(status))
@@ -68,7 +68,7 @@
ZBX_THREAD_HANDLE zbx_thread_start(ZBX_THREAD_ENTRY_POINTER(handler), void *args);
int zbx_thread_wait(ZBX_THREAD_HANDLE thread);
-/* zbx_tread_exit(status) // declared as define !!! */
+/* zbx_thread_exit(status) -- declared as define !!! */
long int zbx_get_thread_id(void);
#endif /* ZABBIX_THREADS_H */