X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Ftime_support.c;h=c5978b423f634fea0d2dddb58d49e392f35a12f7;hb=677b02b475870b7d9e5d86e9bf61dc28dae5a6e4;hp=19343157c96a806d05cdbcb2379d1966a39c07e8;hpb=c8b8a34bb5e98660c4ce3683fb64af31b494d55c;p=openocd.git diff --git a/src/helper/time_support.c b/src/helper/time_support.c index 19343157c9..c5978b423f 100644 --- a/src/helper/time_support.c +++ b/src/helper/time_support.c @@ -21,8 +21,9 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -32,8 +33,7 @@ /* calculate difference between two struct timeval values */ int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y) { - if (x->tv_usec < y->tv_usec) - { + if (x->tv_usec < y->tv_usec) { int nsec = (y->tv_usec - x->tv_usec) / 1000000 + 1; y->tv_usec -= 1000000 * nsec; y->tv_sec += nsec; @@ -51,20 +51,12 @@ int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval * return x->tv_sec < y->tv_sec; } -/* add two struct timeval values */ -int timeval_add(struct timeval *result, struct timeval *x, struct timeval *y) -{ - memcpy(result, x, sizeof(struct timeval)); - return timeval_add_time(result, y->tv_sec, y->tv_usec); -} - int timeval_add_time(struct timeval *result, long sec, long usec) { result->tv_sec += sec; result->tv_usec += usec; - while (result->tv_usec > 1000000) - { + while (result->tv_usec > 1000000) { result->tv_usec -= 1000000; result->tv_sec++; }