[srvx-commits] commit: Fix gcc-4.0 compile warnings and errors.
Brought to you by:
entrope
Menu
▾
▴
[srvx-commits] commit: Fix gcc-4.0 compile warnings and errors.
|
From: Michael P. <md...@tr...> - 2005-07-19 18:19:19
|
Revision: srvx--devo--1.3--patch-24
Archive: sr...@sr...--2005-srvx
Creator: Michael Poole <md...@tr...>
Date: Tue Jul 19 14:18:48 EDT 2005
Standard-date: 2005-07-19 18:18:48 GMT
Modified-files: ChangeLog configure.in languages/validate.pl
src/chanserv.c src/ioset.c src/ioset.h src/nickserv.c
src/opserv.c src/proto-p10.c src/proto.h src/saxdb.c
{arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2004-srvx/patch-log/patch-71
{arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2004-srvx/patch-log/patch-76
{arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2004-srvx/patch-log/patch-77
{arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2004-srvx/patch-log/patch-81
{arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2004-srvx/patch-log/patch-84
{arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2005-srvx/patch-log/patch-22
{arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2005-srvx/patch-log/patch-23
New-patches: sr...@sr...--2005-srvx/srvx--devo--1.3--patch-24
Summary: Fix gcc-4.0 compile warnings and errors.
Keywords:
configure.in: Make sure socklen_t is defined.
src/chanserv.c (bad_channel_ban): Make victimCount unsigned.
src/ioset.c (ioset_run): Fifth argument to getsockopt() should be
socklen_t.
src/ioset.h (clock_skew): Undeclare; it is defined as static.
src/nickserv.c (is_secure_password): Create appropriately typed local
variable for third argument of dict_find().
src/opserv.c (opserv_bad_channel): Likewise.
src/proto-p10.c (call_oper_funcs): Declare at file scope rather than
locally to mod_usermode() function.
src/proto.h (dead_users): Undeclare; it is defined as static.
src/saxdb.c (saxdb_write_int): Fix type of string buffer.
* added files
{arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2005-srvx/patch-log/patch-24
* file metadata changed
./languages/validate.pl
--permissions 664
=> --permissions 775
./{arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2004-srvx/patch-log/patch-71
--permissions 644
=> --permissions 664
./{arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2004-srvx/patch-log/patch-76
--permissions 644
=> --permissions 664
./{arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2004-srvx/patch-log/patch-77
--permissions 644
=> --permissions 664
./{arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2004-srvx/patch-log/patch-81
--permissions 644
=> --permissions 664
./{arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2004-srvx/patch-log/patch-84
--permissions 644
=> --permissions 664
./{arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2005-srvx/patch-log/patch-22
--permissions 644
=> --permissions 664
./{arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2005-srvx/patch-log/patch-23
--permissions 644
=> --permissions 664
* modified files
--- orig/ChangeLog
+++ mod/ChangeLog
@@ -2,6 +2,47 @@
# arch-tag: aut...@sr...--2005-srvx/srvx--devo--1.3
#
+2005-07-19 18:18:48 GMT Michael Poole <md...@tr...> patch-24
+
+ Summary:
+ Fix gcc-4.0 compile warnings and errors.
+ Revision:
+ srvx--devo--1.3--patch-24
+
+ configure.in: Make sure socklen_t is defined.
+
+ src/chanserv.c (bad_channel_ban): Make victimCount unsigned.
+
+ src/ioset.c (ioset_run): Fifth argument to getsockopt() should be
+ socklen_t.
+
+ src/ioset.h (clock_skew): Undeclare; it is defined as static.
+
+ src/nickserv.c (is_secure_password): Create appropriately typed local
+ variable for third argument of dict_find().
+
+ src/opserv.c (opserv_bad_channel): Likewise.
+
+ src/proto-p10.c (call_oper_funcs): Declare at file scope rather than
+ locally to mod_usermode() function.
+
+ src/proto.h (dead_users): Undeclare; it is defined as static.
+
+ src/saxdb.c (saxdb_write_int): Fix type of string buffer.
+
+ modified files:
+ ChangeLog configure.in languages/validate.pl src/chanserv.c
+ src/ioset.c src/ioset.h src/nickserv.c src/opserv.c
+ src/proto-p10.c src/proto.h src/saxdb.c
+ {arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2004-srvx/patch-log/patch-71
+ {arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2004-srvx/patch-log/patch-76
+ {arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2004-srvx/patch-log/patch-77
+ {arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2004-srvx/patch-log/patch-81
+ {arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2004-srvx/patch-log/patch-84
+ {arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2005-srvx/patch-log/patch-22
+ {arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2005-srvx/patch-log/patch-23
+
+
2005-07-04 00:37:07 GMT Zoot <zo...@ga...> patch-23
Summary:
--- orig/configure.in
+++ mod/configure.in
@@ -2,8 +2,8 @@
dnl General initialization.
AC_REVISION([$Id: configure.in,v 1.77 2004/01/02 01:49:15 entrope Exp $])
-AC_PREREQ(2.57)
-AC_INIT(srvx, 1.3, srv...@li...)
+AC_PREREQ(2.59)
+AC_INIT([srvx],[1.3],[srv...@li...])
CODENAME=surge
AC_CONFIG_HEADERS(src/config.h)
AC_CONFIG_SRCDIR(src/opserv.c)
@@ -96,6 +96,32 @@
AC_DEFINE(HAVE_SIN_LEN, 1, [Define if struct sockaddr_in contains a sin_len field])
fi
+dnl Check for socklen_t. In traditional BSD this is an int, but some
+dnl OSes use a different type. Test until we find something that will
+dnl work properly. Test borrowed from a patch submitted for Python.
+AC_CHECK_TYPE([socklen_t], ,[
+ AC_MSG_CHECKING([for socklen_t equivalent])
+ AC_CACHE_VAL([curl_cv_socklen_t_equiv],
+ [
+dnl Systems have either "struct sockaddr*" or "void*" as second
+dnl arg to getpeername.
+ curl_cv_socklen_t_equiv=
+ for arg2 in "struct sockaddr" void ; do
+ for t in int size_t unsigned long "unsigned long" ; do
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+#include <sys/socket.h>
+int getpeername (int $arg2 *, $t *);]], [[$t len;
+ getpeername(0, 0, &len);]])],[curl_cv_socklen_t_equiv="$t"
+ break],[])
+ done
+ done
+ ])
+ AC_MSG_RESULT($curl_cv_socklen_t_equiv)
+ AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
+ [type to use in place of socklen_t if not defined])],
+ [#include <sys/types.h>
+#include<sys/socket.h>])
+
dnl Can only check with -Werror, but the rest of configure doesn't like -Werror
OLD_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -W -Wall -Werror"
--- orig/src/chanserv.c
+++ mod/src/chanserv.c
@@ -2677,7 +2677,7 @@
}
static int
-bad_channel_ban(struct chanNode *channel, struct userNode *user, const char *ban, int *victimCount, struct modeNode **victims)
+bad_channel_ban(struct chanNode *channel, struct userNode *user, const char *ban, unsigned int *victimCount, struct modeNode **victims)
{
unsigned int ii;
--- orig/src/ioset.c
+++ mod/src/ioset.c
@@ -406,7 +406,10 @@
fd->readable_cb(fd);
}
if (FD_ISSET(nn, &write_fds) && !fd->connected) {
- int rc, arglen = sizeof(rc);
+ socklen_t arglen;
+ int rc;
+
+ arglen = sizeof(rc);
if (getsockopt(fd->fd, SOL_SOCKET, SO_ERROR, &rc, &arglen) < 0)
rc = errno;
fd->connected = 1;
--- orig/src/ioset.h
+++ mod/src/ioset.h
@@ -44,7 +44,6 @@
void (*destroy_cb)(struct io_fd *fd);
};
-extern int clock_skew;
extern int do_write_dbs;
extern int do_reopen;
--- orig/src/nickserv.c
+++ mod/src/nickserv.c
@@ -750,6 +750,8 @@
{
unsigned int i, len;
unsigned int cnt_digits = 0, cnt_upper = 0, cnt_lower = 0;
+ int p;
+
len = strlen(pass);
if (len < nickserv_conf.password_min_length) {
if (user)
@@ -761,8 +763,8 @@
send_message(user, nickserv, "NSMSG_PASSWORD_ACCOUNT");
return 0;
}
- dict_find(nickserv_conf.weak_password_dict, pass, &i);
- if (i) {
+ dict_find(nickserv_conf.weak_password_dict, pass, &p);
+ if (p) {
if (user)
send_message(user, nickserv, "NSMSG_PASSWORD_DICTIONARY");
return 0;
--- orig/src/opserv.c
+++ mod/src/opserv.c
@@ -1801,9 +1801,10 @@
opserv_bad_channel(const char *name)
{
unsigned int found;
+ int present;
- dict_find(opserv_exempt_channels, name, &found);
- if (found)
+ dict_find(opserv_exempt_channels, name, &present);
+ if (present)
return 0;
if (gline_find(name))
--- orig/src/proto-p10.c
+++ mod/src/proto-p10.c
@@ -1987,8 +1987,9 @@
free_user(user);
}
+static void call_oper_funcs(struct userNode *user);
+
void mod_usermode(struct userNode *user, const char *mode_change) {
- static void call_oper_funcs(struct userNode *user);
int add = 1;
const char *word = mode_change;
--- orig/src/proto.h
+++ mod/src/proto.h
@@ -108,8 +108,6 @@
typedef void (*oper_func_t) (struct userNode *user);
void reg_oper_func(oper_func_t handler);
-extern struct userList dead_users;
-
/* replay silliness */
void replay_read_line(void);
void replay_event_loop(void);
--- orig/src/saxdb.c
+++ mod/src/saxdb.c
@@ -296,7 +296,7 @@
void
saxdb_write_int(struct saxdb_context *dest, const char *name, unsigned long value) {
- unsigned char buf[16];
+ char buf[16];
/* we could optimize this to take advantage of the fact that buf will never need escapes */
snprintf(buf, sizeof(buf), "%lu", value);
saxdb_write_string(dest, name, buf);
|
