mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-11-03 20:53:13 +03:00 
			
		
		
		
	This automatically-generated patch converts 69 function definitions in glibc from old-style K&R to prototype-style. This patch, covering both sysdeps and non-sysdeps files, deals with cases where the prototype needed to be wrapped over more than one line. Otherwise, exclusions and caveats are as for <https://sourceware.org/ml/libc-alpha/2015-10/msg00594.html> and <https://sourceware.org/ml/libc-alpha/2015-10/msg00599.html>. Tested for x86_64 and x86 (testsuite, and that installed stripped shared libraries are unchanged by the patch). * crypt/crypt-entry.c (__crypt_r): Convert to prototype-style function definition. * crypt/crypt_util.c (__encrypt_r): Likewise. * libio/genops.c (_IO_no_init): Likewise. * libio/iofopncook.c (_IO_fopencookie): Likewise. (_IO_old_fopencookie): Likewise. * libio/iofwrite_u.c (fwrite_unlocked): Likewise. * libio/iogetline.c (_IO_getline): Likewise. (_IO_getline_info): Likewise. * libio/iogetwline.c (_IO_getwline): Likewise. (_IO_getwline_info): Likewise. * libio/vsnprintf.c (_IO_vsnprintf): Likewise. * libio/vswprintf.c (_IO_vswprintf): Likewise. * locale/programs/simple-hash.c (insert_entry_2): Likewise. (find_entry): Likewise. (iterate_table): Likewise. (lookup): Likewise. * login/forkpty.c (forkpty): Likewise. * misc/hsearch_r.c (__hsearch_r): Likewise. * misc/select.c (__select): Likewise. * nptl/cleanup_defer_compat.c (_pthread_cleanup_pop_restore): Likewise. * nptl/old_pthread_cond_init.c (__pthread_cond_init_2_0): Likewise. * nptl/old_pthread_cond_timedwait.c (__pthread_cond_timedwait_2_0): Likewise. * nptl/pthread_barrier_init.c (__pthread_barrier_init): Likewise. * nptl/pthread_barrierattr_getpshared.c (pthread_barrierattr_getpshared): Likewise. * nptl/pthread_getschedparam.c (__pthread_getschedparam): Likewise. * nptl/pthread_mutex_setprioceiling.c (pthread_mutex_setprioceiling): Likewise. * nptl/pthread_mutexattr_getprioceiling.c (pthread_mutexattr_getprioceiling): Likewise. * nptl/pthread_rwlock_init.c (__pthread_rwlock_init): Likewise. * nptl/pthread_rwlock_timedrdlock.c (pthread_rwlock_timedrdlock): Likewise. * nptl/pthread_rwlock_timedwrlock.c (pthread_rwlock_timedwrlock): Likewise. * nptl/pthread_setschedparam.c (__pthread_setschedparam): Likewise. * socket/recvfrom.c (__recvfrom): Likewise. * socket/sendto.c (__sendto): Likewise. * socket/setsockopt.c (__setsockopt): Likewise. * stdio-common/_itoa.c (_itoa): Likewise. * stdio-common/_itowa.c (_itowa): Likewise. * stdio-common/reg-printf.c (__register_printf_specifier): Likewise. (__register_printf_function): Likewise. * stdio-common/tempname.c (__path_search): Likewise. * stdlib/addmul_1.c (mpn_addmul_1): Likewise. * stdlib/mul_1.c (mpn_mul_1): Likewise. * stdlib/random_r.c (__initstate_r): Likewise. * stdlib/setenv.c (__add_to_environ): Likewise. * stdlib/submul_1.c (mpn_submul_1): Likewise. * streams/getpmsg.c (getpmsg): Likewise. * streams/putmsg.c (putmsg): Likewise. * streams/putpmsg.c (putpmsg): Likewise. * sunrpc/clnt_raw.c (clntraw_call): Likewise. * sunrpc/clnt_tcp.c (clnttcp_call): Likewise. * sunrpc/clnt_udp.c (clntudp_create): Likewise. * sunrpc/clnt_unix.c (clntunix_call): Likewise. * sunrpc/pm_getport.c (pmap_getport): Likewise. * sunrpc/svc_udp.c (cache_get): Likewise. * sunrpc/xdr_array.c (xdr_vector): Likewise. * sysdeps/mach/hurd/getcwd.c (__canonicalize_directory_name_internal): Likewise. * sysdeps/mach/hurd/pselect.c (__pselect): Likewise. * sysdeps/mach/hurd/recvfrom.c (__recvfrom): Likewise. * sysdeps/mach/hurd/select.c (__select): Likewise. * sysdeps/posix/ttyname_r.c (getttyname_r): Likewise. * sysdeps/pthread/timer_settime.c (timer_settime): Likewise. * sysdeps/sparc/nptl/pthread_barrier_init.c (__pthread_barrier_init): Likewise. * sysdeps/unix/sysv/linux/hppa/pthread_cond_timedwait.c (__pthread_cond_timedwait): Likewise. * sysdeps/unix/sysv/linux/i386/putmsg.c (putmsg): Likewise. * sysdeps/unix/sysv/linux/s390/semtimedop.c (semtimedop): Likewise. * sysdeps/unix/sysv/linux/semtimedop.c (semtimedop): Likewise. * sysdeps/unix/sysv/linux/timer_settime.c (timer_settime): Likewise. * sysvipc/semtimedop.c (semtimedop): Likewise. * time/setitimer.c (__setitimer): Likewise. * time/strftime_l.c (emacs_strftime): Likewise.
		
			
				
	
	
		
			134 lines
		
	
	
		
			3.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			134 lines
		
	
	
		
			3.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/* Copyright (C) 2000-2015 Free Software Foundation, Inc.
 | 
						|
   This file is part of the GNU C Library.
 | 
						|
   Contributed by Kaz Kylheku <kaz@ashi.footprints.net>.
 | 
						|
 | 
						|
   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; see the file COPYING.LIB.  If
 | 
						|
   not, see <http://www.gnu.org/licenses/>.  */
 | 
						|
 | 
						|
#include <errno.h>
 | 
						|
#include <pthread.h>
 | 
						|
#include <time.h>
 | 
						|
 | 
						|
#include "posix-timer.h"
 | 
						|
 | 
						|
 | 
						|
/* Set timer TIMERID to VALUE, returning old value in OVLAUE.  */
 | 
						|
int
 | 
						|
timer_settime (timer_t timerid, int flags, const struct itimerspec *value,
 | 
						|
	       struct itimerspec *ovalue)
 | 
						|
{
 | 
						|
  struct timer_node *timer;
 | 
						|
  struct thread_node *thread = NULL;
 | 
						|
  struct timespec now;
 | 
						|
  int have_now = 0, need_wakeup = 0;
 | 
						|
  int retval = -1;
 | 
						|
 | 
						|
  timer = timer_id2ptr (timerid);
 | 
						|
  if (timer == NULL)
 | 
						|
    {
 | 
						|
      __set_errno (EINVAL);
 | 
						|
      goto bail;
 | 
						|
    }
 | 
						|
 | 
						|
  if (value->it_interval.tv_nsec < 0
 | 
						|
      || value->it_interval.tv_nsec >= 1000000000
 | 
						|
      || value->it_value.tv_nsec < 0
 | 
						|
      || value->it_value.tv_nsec >= 1000000000)
 | 
						|
    {
 | 
						|
      __set_errno (EINVAL);
 | 
						|
      goto bail;
 | 
						|
    }
 | 
						|
 | 
						|
  /* Will need to know current time since this is a relative timer;
 | 
						|
     might as well make the system call outside of the lock now! */
 | 
						|
 | 
						|
  if ((flags & TIMER_ABSTIME) == 0)
 | 
						|
    {
 | 
						|
      clock_gettime (timer->clock, &now);
 | 
						|
      have_now = 1;
 | 
						|
    }
 | 
						|
 | 
						|
  pthread_mutex_lock (&__timer_mutex);
 | 
						|
  timer_addref (timer);
 | 
						|
 | 
						|
  /* One final check of timer validity; this one is possible only
 | 
						|
     until we have the mutex, because it accesses the inuse flag. */
 | 
						|
 | 
						|
  if (! timer_valid(timer))
 | 
						|
    {
 | 
						|
      __set_errno (EINVAL);
 | 
						|
      goto unlock_bail;
 | 
						|
    }
 | 
						|
 | 
						|
  if (ovalue != NULL)
 | 
						|
    {
 | 
						|
      ovalue->it_interval = timer->value.it_interval;
 | 
						|
 | 
						|
      if (timer->armed)
 | 
						|
	{
 | 
						|
	  if (! have_now)
 | 
						|
	    {
 | 
						|
	      pthread_mutex_unlock (&__timer_mutex);
 | 
						|
	      clock_gettime (timer->clock, &now);
 | 
						|
	      have_now = 1;
 | 
						|
	      pthread_mutex_lock (&__timer_mutex);
 | 
						|
	      timer_addref (timer);
 | 
						|
	    }
 | 
						|
 | 
						|
	  timespec_sub (&ovalue->it_value, &timer->expirytime, &now);
 | 
						|
	}
 | 
						|
      else
 | 
						|
	{
 | 
						|
	  ovalue->it_value.tv_sec = 0;
 | 
						|
	  ovalue->it_value.tv_nsec = 0;
 | 
						|
	}
 | 
						|
    }
 | 
						|
 | 
						|
  timer->value = *value;
 | 
						|
 | 
						|
  list_unlink_ip (&timer->links);
 | 
						|
  timer->armed = 0;
 | 
						|
 | 
						|
  thread = timer->thread;
 | 
						|
 | 
						|
  /* A value of { 0, 0 } causes the timer to be stopped. */
 | 
						|
  if (value->it_value.tv_sec != 0
 | 
						|
      || __builtin_expect (value->it_value.tv_nsec != 0, 1))
 | 
						|
    {
 | 
						|
      if ((flags & TIMER_ABSTIME) != 0)
 | 
						|
	/* The user specified the expiration time.  */
 | 
						|
	timer->expirytime = value->it_value;
 | 
						|
      else
 | 
						|
	timespec_add (&timer->expirytime, &now, &value->it_value);
 | 
						|
 | 
						|
      /* Only need to wake up the thread if timer is inserted
 | 
						|
	 at the head of the queue. */
 | 
						|
      if (thread != NULL)
 | 
						|
	need_wakeup = __timer_thread_queue_timer (thread, timer);
 | 
						|
      timer->armed = 1;
 | 
						|
    }
 | 
						|
 | 
						|
  retval = 0;
 | 
						|
 | 
						|
unlock_bail:
 | 
						|
  timer_delref (timer);
 | 
						|
  pthread_mutex_unlock (&__timer_mutex);
 | 
						|
 | 
						|
bail:
 | 
						|
  if (thread != NULL && need_wakeup)
 | 
						|
    __timer_thread_wakeup (thread);
 | 
						|
 | 
						|
  return retval;
 | 
						|
}
 |