picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

* resolv/res_mkquery.c (__res_nopt): Use NS_PUT16 instead of ns_put16.

Browse source
This commit is contained in:
Ulrich Drepper 2008-04-20 04:56:49 +00:00
parent c52137d391
commit 0073dd2d49
3 changed files with 62 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2008-04-19 Ulrich Drepper <drepper@redhat.com>
* resolv/res_mkquery.c (__res_nopt): Use NS_PUT16 instead of ns_put16.
2008-04-15 Ulrich Drepper <drepper@redhat.com>
[BZ #5209]

12
resolv/res_mkquery.c
View file

@ -238,17 +238,13 @@ __res_nopt(res_state statp,
*cp++ = 0; /* "." */
ns_put16(T_OPT, cp); /* TYPE */
cp += INT16SZ;
ns_put16(anslen & 0xffff, cp); /* CLASS = UDP payload size */
cp += INT16SZ;
NS_PUT16(T_OPT, cp); /* TYPE */
NS_PUT16(anslen & 0xffff, cp); /* CLASS = UDP payload size */
*cp++ = NOERROR; /* extended RCODE */
*cp++ = 0; /* EDNS version */
/* XXX Once we support DNSSEC we change the flag value here. */
ns_put16(flags, cp);
cp += INT16SZ;
ns_put16(0, cp); /* RDLEN */
cp += INT16SZ;
NS_PUT16(flags, cp);
NS_PUT16(0, cp); /* RDLEN */
hp->arcount = htons(ntohs(hp->arcount) + 1);
return cp - buf;

54
sysdeps/unix/sysv/linux/times.c Normal file
View file

@ -0,0 +1,54 @@
/* Copyright (C) 2008 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <errno.h>
#include <sys/times.h>
#include <sysdep.h>
clock_t
__times (struct tms *buf)
{
INTERNAL_SYSCALL_DECL (err);
clock_t ret = INTERNAL_SYSCALL (times, err, 1, buf);
if (INTERNAL_SYSCALL_ERROR_P (ret, err)
&& __builtin_expect (INTERNAL_SYSCALL_ERRNO (ret, err) == -EFAULT, 0))
{
/* This might be an error or not. For architectures which have
no separate return value and error indicators we cannot
distinguish a return value of -1 from an error. Do it the
hard way. We crash applications which pass in an invalid BUF
pointer. */
#define touch(v) \
do { \
clock_t temp = v; \
asm volatile ("" : "+r" (temp)); \
v = temp; \
} while (0)
touch (buf->tms_utime);
touch (buf->tms_stime);
touch (buf->tms_cutime);
touch (buf->tms_cstime);
/* If we come here the memory is valid and the kernel did not
return an EFAULT error. Return the value given by the kernel. */
}
return ret;
}
weak_alias (__times, times)