WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] xenstat: some cleanups

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1213103753 -3600
# Node ID f70dff36213b0a95b9b8b2fc821ab9850c3efc70
# Parent  d77214a97e0408e320ab67beb5f884e63bf35b6b
xenstat: some cleanups
 sprintf -> snprintf
 malloc(n * m) -> calloc(n, m)
 get rid of a cast

Signed-off-by: Christoph Egger <Christoph.Egger@xxxxxxx>
---
 tools/xenstat/libxenstat/src/xenstat_linux.c |    3 ++-
 tools/xenstat/xentop/xentop.c                |    7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff -r d77214a97e04 -r f70dff36213b 
tools/xenstat/libxenstat/src/xenstat_linux.c
--- a/tools/xenstat/libxenstat/src/xenstat_linux.c      Tue Jun 10 13:50:31 
2008 +0100
+++ b/tools/xenstat/libxenstat/src/xenstat_linux.c      Tue Jun 10 14:15:53 
2008 +0100
@@ -165,7 +165,8 @@ static int read_attributes_vbd(const cha
        static char file_name[80];
        int fd, num_read;
 
-       sprintf(file_name, "%s/%s/%s", SYSFS_VBD_PATH, vbd_directory, what);
+       snprintf(file_name, sizeof(file_name), "%s/%s/%s",
+               SYSFS_VBD_PATH, vbd_directory, what);
        fd = open(file_name, O_RDONLY, 0);
        if (fd==-1) return -1;
        num_read = read(fd, ret, cap - 1);
diff -r d77214a97e04 -r f70dff36213b tools/xenstat/xentop/xentop.c
--- a/tools/xenstat/xentop/xentop.c     Tue Jun 10 13:50:31 2008 +0100
+++ b/tools/xenstat/xentop/xentop.c     Tue Jun 10 14:15:53 2008 +0100
@@ -755,10 +755,11 @@ void do_summary(void)
        unsigned i, num_domains = 0;
        unsigned long long used = 0;
        xenstat_domain *domain;
+       time_t curt;
 
        /* Print program name, current time, and number of domains */
-       strftime(time_str, TIME_STR_LEN, TIME_STR_FORMAT,
-                localtime((const time_t *)&curtime.tv_sec));
+       curt = curtime.tv_sec;
+       strftime(time_str, TIME_STR_LEN, TIME_STR_FORMAT, localtime(&curt));
        num_domains = xenstat_node_num_domains(cur_node);
        ver_str = xenstat_node_xen_version(cur_node);
        print("xentop - %s   Xen %s\n", time_str, ver_str);
@@ -978,7 +979,7 @@ static void top(void)
        /* Count the number of domains for which to report data */
        num_domains = xenstat_node_num_domains(cur_node);
 
-       domains = malloc(num_domains*sizeof(xenstat_domain *));
+       domains = calloc(num_domains, sizeof(xenstat_domain *));
        if(domains == NULL)
                fail("Failed to allocate memory\n");
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] xenstat: some cleanups, Xen patchbot-unstable <=