MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-26 15:33:54 +01:00
Code Issues Releases Wiki Activity

Merge pull request #176 from staticfox/morecleanups

Browse source 
More cleanups
This commit is contained in:
William Pitcock 2016-03-23 19:14:46 -05:00
commit c604800a68
43 changed files with 24 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
authd/getaddrinfo.c
View file

@ -31,8 +31,6 @@
#include <rb_lib.h>
#include "getaddrinfo.h"
/* $Id$ */
static const char in_addrany[] = { 0, 0, 0, 0 };
static const char in_loopback[] = { 127, 0, 0, 1 };
static const char in6_addrany[] = {
@ -94,7 +92,7 @@ static const struct explore explore[] = {
#define PTON_MAX 16
static int str_isnumber(const char *);
static bool str_isnumber(const char *);
static int explore_null(const struct rb_addrinfo *,
const char *, struct rb_addrinfo **);
static int explore_numeric(const struct rb_addrinfo *, const char *,
@ -183,7 +181,7 @@ rb_freeaddrinfo(struct rb_addrinfo *ai)
} while (ai);
}
static int
static bool
str_isnumber(const char *p)
{
char *ep;
@ -194,9 +192,9 @@ str_isnumber(const char *p)
errno = 0;
(void)strtoul(p, &ep, 10);
if (errno == 0 && ep && *ep == '\0')
return YES;
return true;
else
return NO;
return false;
}
int
@ -497,7 +495,7 @@ get_ai(const struct rb_addrinfo *pai, const struct afd *afd, const char *addr)
{
char *p;
struct rb_addrinfo *ai;
ai = (struct rb_addrinfo *)rb_malloc(sizeof(struct rb_addrinfo)
+ (afd->a_socklen));
if (ai == NULL)
@ -517,7 +515,7 @@ static int
get_portmatch(const struct rb_addrinfo *ai, const char *servname)
{
struct rb_addrinfo xai;
memcpy(&xai, ai, sizeof(struct rb_addrinfo));
memcpy(&xai, ai, sizeof(struct rb_addrinfo));
return(get_port(&xai, servname, 1));
}

3
authd/getaddrinfo.h
View file

@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id$
*/
struct rb_addrinfo {
@ -94,8 +93,6 @@ void rb_freeaddrinfo(struct rb_addrinfo *ai);
#define SUCCESS 0
#define ANY 0
#define YES 1
#define NO 0
#undef EAI_ADDRFAMILY
#undef EAI_AGAIN

2
authd/getnameinfo.c
View file

@ -46,8 +46,6 @@
#include "getaddrinfo.h"
#include "getnameinfo.h"
/* $Id$ */
static const struct afd {
int a_af;
int a_addrlen;

1
authd/getnameinfo.h
View file

@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id$
*/
int rb_getnameinfo(const struct sockaddr *sa, rb_socklen_t salen, char *host,

19
librb/acinclude.m4
View file

@ -1,4 +1,3 @@
# $Id: acinclude.m4 23020 2006-09-01 18:20:19Z androsyn $ - aclocal.m4 - Autoconf fun...
AC_DEFUN([AC_DEFINE_DIR], [
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@ -34,7 +33,7 @@ AC_DEFUN([AC_SUBST_DIR], [
dnl IPv6 support macros..pretty much swiped from wget
dnl RB_PROTO_INET6
AC_DEFUN([RB_PROTO_INET6],[
AC_CACHE_CHECK([for INET6 protocol support], [rb_cv_proto_inet6],[
AC_TRY_CPP([
@ -57,14 +56,14 @@ AC_DEFUN([RB_PROTO_INET6],[
],[
rb_cv_proto_inet6=no
])
])
])
if test "X$rb_cv_proto_inet6" = "Xyes"; then :
$1
else :
$2
fi
])
$2
fi
])
AC_DEFUN([RB_TYPE_STRUCT_SOCKADDR_IN6],[
@ -93,7 +92,7 @@ AC_DEFUN([RB_TYPE_STRUCT_SOCKADDR_IN6],[
AC_DEFUN([RB_CHECK_TIMER_CREATE],
[AC_CACHE_CHECK([for a working timer_create(CLOCK_REALTIME)],
[AC_CACHE_CHECK([for a working timer_create(CLOCK_REALTIME)],
[rb__cv_timer_create_works],
[AC_TRY_RUN([
#ifdef HAVE_TIME_H
@ -126,7 +125,7 @@ int main(int argc, char *argv[])
[rb__cv_timer_create_works=no])
])
case $rb__cv_timer_create_works in
yes) AC_DEFINE([USE_TIMER_CREATE], 1,
yes) AC_DEFINE([USE_TIMER_CREATE], 1,
[Define to 1 if we can use timer_create(CLOCK_REALTIME,...)]);;
esac
])
@ -134,7 +133,7 @@ esac
AC_DEFUN([RB_CHECK_TIMERFD_CREATE],
[AC_CACHE_CHECK([for a working timerfd_create(CLOCK_REALTIME)],
[AC_CACHE_CHECK([for a working timerfd_create(CLOCK_REALTIME)],
[rb__cv_timerfd_create_works],
[AC_TRY_RUN([
#ifdef HAVE_TIME_H
@ -166,7 +165,7 @@ int main(int argc, char *argv[])
[rb__cv_timerfd_create_works=no])
])
case $rb__cv_timerfd_create_works in
yes) AC_DEFINE([USE_TIMERFD_CREATE], 1,
yes) AC_DEFINE([USE_TIMERFD_CREATE], 1,
[Define to 1 if we can use timerfd_create(CLOCK_REALTIME,...)]);;
esac
])

1
librb/include/commio-int.h
View file

@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: commio.h 24059 2007-07-24 17:25:41Z androsyn $
*/
#ifndef _COMMIO_INT_H

1
librb/include/commio-ssl.h
View file

@ -19,7 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: commio-ssl.h 26280 2008-12-10 20:25:29Z androsyn $
*/
#ifndef _COMMIO_SSL_H

1
librb/include/event-int.h
View file

@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: event-int.h 26272 2008-12-10 05:55:10Z androsyn $
*/
struct ev_entry

1
librb/include/rb_balloc.h
View file

@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: rb_balloc.h 26092 2008-09-19 15:13:52Z androsyn $
*/
#ifndef RB_LIB_H

1
librb/include/rb_commio.h
View file

@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: rb_commio.h 26092 2008-09-19 15:13:52Z androsyn $
*/
#ifndef RB_LIB_H

1
librb/include/rb_event.h
View file

@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: rb_event.h 26092 2008-09-19 15:13:52Z androsyn $
*/
#ifndef RB_LIB_H

1
librb/include/rb_helper.h
View file

@ -19,7 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: rb_helper.h 26092 2008-09-19 15:13:52Z androsyn $
*/
#ifndef RB_LIB_H

1
librb/include/rb_linebuf.h
View file

@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: rb_linebuf.h 26092 2008-09-19 15:13:52Z androsyn $
*/
#ifndef RB_LIB_H

1
librb/include/rb_memory.h
View file

@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: rb_memory.h 26092 2008-09-19 15:13:52Z androsyn $
*/
#ifndef RB_LIB_H

1
librb/include/rb_patricia.h
View file

@ -1,5 +1,4 @@
/*
* $Id: patricia.h 23020 2006-09-01 18:20:19Z androsyn $
* Dave Plonka <plonka@doit.wisc.edu>
*
* This product includes software developed by the University of Michigan,

1
librb/include/rb_rawbuf.h
View file

@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id$
*/
#ifndef RB_LIB_H

1
librb/include/rb_tools.h
View file

@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: rb_tools.h 26170 2008-10-26 20:59:07Z androsyn $
*/
#ifndef RB_LIB_H

1
librb/src/Makefile.am
View file

@ -1,4 +1,3 @@
# $Id: Makefile.am 26046 2008-09-09 16:37:30Z androsyn $
AUTOMAKE_OPTIONS = foreign

1
librb/src/arc4random.c
View file

@ -1,4 +1,3 @@
/* $Id: arc4random.c 26092 2008-09-19 15:13:52Z androsyn $ */
/* $$$: arc4random.c 2005/02/08 robert */
/* $NetBSD: arc4random.c,v 1.5.2.1 2004/03/26 22:52:50 jmc Exp $ */
/* $OpenBSD: arc4random.c,v 1.6 2001/06/05 05:05:38 pvalchev Exp $ */

1
librb/src/balloc.c
View file

@ -28,7 +28,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: balloc.c 26100 2008-09-20 01:27:19Z androsyn $
*/
/*

2
librb/src/commio.c
View file

@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: commio.c 26254 2008-12-10 04:04:38Z androsyn $
*/
#include <librb_config.h>
#include <rb_lib.h>
#include <commio-int.h>

2
librb/src/devpoll.c
View file

@ -22,8 +22,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: devpoll.c 26254 2008-12-10 04:04:38Z androsyn $
*/
#include <librb_config.h>
#include <rb_lib.h>
#include <commio-int.h>

2
librb/src/epoll.c
View file

@ -23,8 +23,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: epoll.c 26294 2008-12-13 03:01:19Z androsyn $
*/
#define _GNU_SOURCE 1
#include <librb_config.h>

1
librb/src/event.c
View file

@ -39,7 +39,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: event.c 26272 2008-12-10 05:55:10Z androsyn $
*/
#include <librb_config.h>

1
librb/src/gnutls.c
View file

@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: gnutls.c 26296 2008-12-13 03:36:00Z androsyn $
*/
#include <librb_config.h>

2
librb/src/helper.c
View file

@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: helper.c 26092 2008-09-19 15:13:52Z androsyn $
*/
#include <librb_config.h>
#include <rb_lib.h>
#include <commio-int.h>

1
librb/src/kqueue.c
View file

@ -22,7 +22,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: kqueue.c 26092 2008-09-19 15:13:52Z androsyn $
*/
#include <librb_config.h>

1
librb/src/linebuf.c
View file

@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: linebuf.c 26092 2008-09-19 15:13:52Z androsyn $
*/
#include <librb_config.h>

1
librb/src/mbedtls.c
View file

@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id$
*/
#include <librb_config.h>

1
librb/src/nossl.c
View file

@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: commio.c 24808 2008-01-02 08:17:05Z androsyn $
*/

1
librb/src/openssl.c
View file

@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: commio.c 24808 2008-01-02 08:17:05Z androsyn $
*/
#include <librb_config.h>

1
librb/src/patricia.c
View file

@ -4,7 +4,6 @@
* This was then yanked out of the ratbox/devel/src tree and stuffed into
* librb and had function names changed, but otherwise not really altered.
*
* $Id: patricia.c 24244 2007-08-22 19:04:55Z androsyn $
* Dave Plonka <plonka@doit.wisc.edu>
*
* This product includes software developed by the University of Michigan,

1
librb/src/poll.c
View file

@ -22,7 +22,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: poll.c 26092 2008-09-19 15:13:52Z androsyn $
*/
#include <librb_config.h>
#include <rb_lib.h>

1
librb/src/ports.c
View file

@ -23,7 +23,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: ports.c 26286 2008-12-10 23:28:53Z androsyn $
*/
#include <librb_config.h>

1
librb/src/rawbuf.c
View file

@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id$
*/
#include <librb_config.h>
#include <rb_lib.h>

1
librb/src/rb_lib.c
View file

@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: rb_lib.c 26282 2008-12-10 20:33:21Z androsyn $
*/
#include <librb_config.h>

1
librb/src/rb_memory.c
View file

@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: rb_memory.c 26092 2008-09-19 15:13:52Z androsyn $
*/
#include <librb_config.h>
#include <rb_lib.h>

2
librb/src/select.c
View file

@ -22,8 +22,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: select.c 26092 2008-09-19 15:13:52Z androsyn $
*/
#define FD_SETSIZE 65535
#include <librb_config.h>
#include <rb_lib.h>

1
librb/src/sigio.c
View file

@ -23,7 +23,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: sigio.c 26092 2008-09-19 15:13:52Z androsyn $
*/
#ifndef _GNU_SOURCE

2
librb/src/tools.c
View file

@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: tools.c 26170 2008-10-26 20:59:07Z androsyn $
*
* Here is the original header:
*
@ -32,6 +31,7 @@
* defined, tools.h will build inlined versions of the functions
* on supported compilers
*/
#define _GNU_SOURCE 1
#include <librb_config.h>
#include <rb_lib.h>

2
librb/src/unix.c
View file

@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: unix.c 26180 2008-11-11 00:00:12Z androsyn $
*/
#include <librb_config.h>
#include <rb_lib.h>

5
librb/src/version.c.SH
View file

@ -1,6 +1,5 @@
#!/bin/sh
# $Id: version.c.SH 24870 2008-01-10 16:51:01Z androsyn $
spitshell=cat
package=librb
@ -21,7 +20,7 @@ $spitshell >version.c <<!SUB!THIS!
/*
* librb: a library used by charybdis and other things
* src/version.c
*
*
* Copyright (C) 1990 Chelsea Ashley Dyerman
* Copyright (C) 2008 ircd-ratbox development team
*
@ -55,7 +54,7 @@ const char *librb_infotext[] =
"$package --",
"Based on the original code written by Jarkko Oikarinen",
"Copyright 1988, 1989, 1990, 1991 University of Oulu, Computing Center",
"Copyright (c) 1996-2001 Hybrid Development Team",
"Copyright (c) 1996-2001 Hybrid Development Team",
"Copyright (c) 2002-2008 ircd-ratbox Development Team",
"",
"This program is free software; you can redistribute it and/or",

1
librb/src/win32.c
View file

@ -23,7 +23,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
* $Id: win32.c 26092 2008-09-19 15:13:52Z androsyn $
*/
#include <librb_config.h>