diff options
author | Brian Tierney <bltierney@es.net> | 2009-11-16 20:10:48 +0000 |
---|---|---|
committer | Brian Tierney <bltierney@es.net> | 2009-11-16 20:10:48 +0000 |
commit | dfb2d9d470d9ec8c131b098a2ae161d95fe117ab (patch) | |
tree | b122f0e98e83dc98c512fbec7f078be4bce7be18 /src/timer.c | |
parent | f4e1c1d4a42f0921d85c60853acc3c18e80222e8 (diff) | |
download | iperf3-dfb2d9d470d9ec8c131b098a2ae161d95fe117ab.tar.gz |
some memory usage cleanup based on valgrind report
Diffstat (limited to 'src/timer.c')
-rw-r--r-- | src/timer.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/timer.c b/src/timer.c index 1807ff9..902f2cf 100644 --- a/src/timer.c +++ b/src/timer.c @@ -65,7 +65,6 @@ update_timer(struct timer * tp, time_t sec, suseconds_t usec) { perror("gettimeofday"); } - memcpy(&tp->end, &tp->begin, sizeof(struct timer)); tp->end.tv_sec = tp->begin.tv_sec + (time_t) sec; tp->end.tv_usec = tp->begin.tv_usec + (time_t) usec; @@ -75,8 +74,8 @@ update_timer(struct timer * tp, time_t sec, suseconds_t usec) struct timer * new_timer(time_t sec, suseconds_t usec) { - struct timer *tp; - tp = (struct timer *) malloc(sizeof(struct timer)); + struct timer *tp = NULL; + tp = (struct timer *) calloc(1, sizeof(struct timer)); if (tp == NULL) { perror("malloc"); @@ -88,7 +87,7 @@ new_timer(time_t sec, suseconds_t usec) perror("gettimeofday"); return NULL; } - memcpy(&tp->end, &tp->begin, sizeof(struct timer)); + tp->end.tv_sec = tp->begin.tv_sec + (time_t) sec; tp->end.tv_usec = tp->begin.tv_usec + (time_t) usec; |