Zabbix / Zabbix / d955dd26cdc

Commits

No tags

Miks Kronkalns authored d955dd26cdcM13 Apr 2021

.......... [ZBXNEXT-6451] updated to latest from origin (without conflicts)

Showing diff toc4f0402b2d6

src/libs/zbxdbupgrade
- dbupgrade_5030.c

Display entire source for this file Unified diff
Side-by-side diff
Ignore whitespace
Show whitespace characters
Hide e-diff
Color accessibility
src/libs/zbxdbupgrade/dbupgrade_5030.c
Modified
 
    func = (zbx_dbpatch_function_t *)zbx_malloc(NULL, sizeof(zbx_dbpatch_function_t));
    func->functionid = 0;
    func->itemid = 0;
    func->flags = 0;
    func->name = name;
    func->parameter = zbx_substr(expression, data->func_param.l + 1, data->func_param.r -1);
​
    host = zbx_substr(expression, data->host.l, data->host.r);
    key = zbx_substr(expression, data->key.l, data->key.r);
​
    /* TODO: clarify if {HOST.HOST} should be replaced with //
    if (0 == strcmp(host, "{HOST.HOST}"))
        func->arg0 = zbx_dsprintf(NULL, "//%s", key);
    else
    */
    func->arg0 = zbx_dsprintf(NULL, "/%s/%s", host, key);
        func->arg0 = zbx_dsprintf(NULL, "/%s/%s", host, key);
​
    zbx_vector_ptr_append(&functions, func);
​
    dbpatch_convert_function(func, function, &functions);
    if (NULL == *function)
        *function = zbx_strdup(NULL, "{0}");
    dbpatch_replace_functionids(function, &functions);
​
    zbx_free(key);
    zbx_free(host);

Zabbix

Jira Issues