head	1.3;
access;
symbols
	adns_1_0:1.1.1.3
	adns_0_9:1.1.1.2
	adns_0_8:1.1.1.2
	adns_0_7:1.1.1.1
	vendor:1.1.1;
locks; strict;
comment	@ * @;


1.3
date	2000.09.19.15.55.21;	author rse;	state Exp;
branches;
next	1.2;

1.2
date	2000.05.08.14.10.25;	author rse;	state Exp;
branches;
next	1.1;

1.1
date	99.11.30.17.11.58;	author rse;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2000.03.02.09.34.03;	author rse;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2000.05.08.14.05.32;	author rse;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2000.09.19.15.46.50;	author rse;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Merge in conflicts
@
text
@/*
 * tvarith.c
 * - static functions for doing arithmetic on timevals
 */
/*
 *  This file is
 *    Copyright (C) 1997-1999 Ian Jackson <ian@@davenant.greenend.org.uk>
 *
 *  It is part of adns, which is
 *    Copyright (C) 1997-2000 Ian Jackson <ian@@davenant.greenend.org.uk>
 *    Copyright (C) 1999-2000 Tony Finch <dot@@dotat.at>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2, or (at your option)
 *  any later version.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  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.
 */

#include "adns_internal.h"

void _adns_timevaladd(struct timeval *tv_io, long ms) {
  struct timeval tmp;
  assert(ms>=0);
  tmp= *tv_io;
  tmp.tv_usec += (ms%1000)*1000;
  tmp.tv_sec += ms/1000;
  if (tmp.tv_usec >= 1000000) { tmp.tv_sec++; tmp.tv_usec -= 1000000; }
  *tv_io= tmp;
}

@


1.2
log
@Resolve conflicts with ADNS 0.8
@
text
@d11 1
a11 1
 *    Copyright (C) 1999 Tony Finch <dot@@dotat.at>
@


1.1
log
@Remove inline stuff
@
text
@d10 1
a10 1
 *    Copyright (C) 1997-1999 Ian Jackson <ian@@davenant.greenend.org.uk>
@


1.1.1.1
log
@Import of ADNS 0.7
@
text
@d2 2
a3 2
 * tvarith.h
 * - static inline functions for doing arithmetic on timevals
d28 1
a28 2
#ifndef ADNS_TVARITH_H_INCLUDED
#define ADNS_TVARITH_H_INCLUDED
d30 1
a30 1
static inline void timevaladd(struct timeval *tv_io, long ms) {
a39 1
#endif
@


1.1.1.2
log
@Import of ADNS 0.8
@
text
@d10 1
a10 1
 *    Copyright (C) 1997-2000 Ian Jackson <ian@@davenant.greenend.org.uk>
@


1.1.1.3
log
@Import of ADNS 1.0
@
text
@d11 1
a11 1
 *    Copyright (C) 1999-2000 Tony Finch <dot@@dotat.at>
@