diff options
| -rw-r--r-- | epan/except.c | 28 | ||||
| -rw-r--r-- | inet_ntop.c | 4 | ||||
| -rw-r--r-- | inet_pton.c | 6 |
3 files changed, 14 insertions, 24 deletions
diff --git a/epan/except.c b/epan/except.c index 83d8b95846..eea81d3a01 100644 --- a/epan/except.c +++ b/epan/except.c @@ -2,6 +2,8 @@ * Portable Exception Handling for ANSI C. * Copyright (C) 1999 Kaz Kylheku <kaz@ashi.footprints.net> * + * $Id$ + * * Free Software License: * * All rights are reserved by the author, with the following exceptions: @@ -13,8 +15,6 @@ * This source code may be translated into executable form and incorporated * into proprietary software; there is no requirement for such software to * contain a copyright notice related to this source. - * $Id$ - * $Name: $ */ /* @@ -45,10 +45,6 @@ #define XCEPT_BUFFER_SIZE 1024 -#ifdef KAZLIB_RCSID -static const char rcsid[] = "$Id$"; -#endif - #ifdef KAZLIB_POSIX_THREADS #include <pthread.h> @@ -139,13 +135,13 @@ void except_deinit(void) static int init_counter; static void unhandled_catcher(except_t *); static void (*uh_catcher_ptr)(except_t *) = unhandled_catcher; -/* We need this 'size_t' cast due to a glitch in GLib where g_malloc was prototyped - * as 'gpointer g_malloc (gulong n_bytes)'. This was later fixed to the correct prototype - * 'gpointer g_malloc (gsize n_bytes)'. In Wireshark we use the latter prototype - * throughout the code. We can get away with this even with older versions of GLib by - * adding a '(void *(*)(size_t))' cast whenever we refer to g_malloc. The only platform - * supported by Wireshark where this isn't safe (sizeof size_t != sizeof gulong) is Win64. - * However, we _always_ bundle the newest version of GLib on this platform so +/* We need this 'size_t' cast due to a glitch in GLib where g_malloc was prototyped + * as 'gpointer g_malloc (gulong n_bytes)'. This was later fixed to the correct prototype + * 'gpointer g_malloc (gsize n_bytes)'. In Wireshark we use the latter prototype + * throughout the code. We can get away with this even with older versions of GLib by + * adding a '(void *(*)(size_t))' cast whenever we refer to g_malloc. The only platform + * supported by Wireshark where this isn't safe (sizeof size_t != sizeof gulong) is Win64. + * However, we _always_ bundle the newest version of GLib on this platform so * the size_t issue doesn't exists here. Pheew.. */ static void *(*allocator)(size_t) = (void *(*)(size_t)) g_malloc; static void (*deallocator)(void *) = g_free; @@ -178,9 +174,9 @@ void except_deinit(void) static int match(const volatile except_id_t *thrown, const except_id_t *caught) { - int group_match = (caught->except_group == XCEPT_GROUP_ANY || + int group_match = (caught->except_group == XCEPT_GROUP_ANY || caught->except_group == thrown->except_group); - int code_match = (caught->except_code == XCEPT_CODE_ANY || + int code_match = (caught->except_code == XCEPT_CODE_ANY || caught->except_code == thrown->except_code); return group_match && code_match; @@ -190,7 +186,7 @@ G_GNUC_NORETURN static void do_throw(except_t *except) { struct except_stacknode *top; - assert (except->except_id.except_group != 0 && + assert (except->except_id.except_group != 0 && except->except_id.except_code != 0); for (top = get_top(); top != 0; top = top->except_down) { diff --git a/inet_ntop.c b/inet_ntop.c index f1b4e49433..ab93d69096 100644 --- a/inet_ntop.c +++ b/inet_ntop.c @@ -22,10 +22,6 @@ #include "config.h" #endif -#if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$Id$"; -#endif /* LIBC_SCCS and not lint */ - #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> #endif diff --git a/inet_pton.c b/inet_pton.c index 6fd6f748b0..7d9e73a6c2 100644 --- a/inet_pton.c +++ b/inet_pton.c @@ -1,6 +1,8 @@ /* * Copyright (c) 1996,1999 by Internet Software Consortium. * + * $Id$ + * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. @@ -19,10 +21,6 @@ #include "config.h" #endif -#if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$Id$"; -#endif /* LIBC_SCCS and not lint */ - #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> #endif |