← Back to branch summary

~ubuntu-dev/ubuntu/lucid/zabbix/lucid-201002110857

« back to all changes in this revision

Viewing changes to src/libs/zbxsysinfo/netbsd/memory.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Ablassmeier
  • Date: 2007-07-02 09:06:51 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20070702090651-8l6fl3fjw9rh6l2u
Tags: 1:1.4.1-2
Add patch from SVN in order to fix Incorrect processing of character '%'
in user parameters and remote commands.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libs/zbxsysinfo/netbsd/memory.c
17
17
** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18
18
**/
19
19
 
20
 
#include "config.h"
21
 
 
22
20
#include "common.h"
 
21
 
23
22
#include "sysinfo.h"
24
23
 
25
24
static int      VM_MEMORY_CACHED(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
34
33
 
35
34
        init_result(result);
36
35
 
37
 
        f=fopen("/proc/meminfo","r");
38
 
        if(NULL == f)
 
36
        if( NULL == (f = fopen("/proc/meminfo","r") ))
39
37
        {
40
38
                return  SYSINFO_RET_FAIL;
41
39
        }
56
54
                        break;
57
55
                }
58
56
        }
59
 
        fclose(f);
 
57
        zbx_fclose(f);
60
58
 
61
59
        SET_UI64_RESULT(result, res);
62
60
        return SYSINFO_RET_OK;
395
393
        if(mode[0] == '\0')
396
394
        {
397
395
                /* default parameter */
398
 
                sprintf(mode, "total");
 
396
                zbx_snprintf(mode, sizeof(mode), "total");
399
397
        }
400
398
        
401
399
        for(i=0; fl[i].mode!=0; i++)