changeset 12497:202ce52b77a9

[gaim-migrate @ 14809] I dislike the use of the extern keyword on functions in header files. It doesn't make a difference, does it? committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Fri, 16 Dec 2005 09:02:17 +0000
parents f9d0ab1474ac
children a2de852981c1
files plugins/docklet/docklet.h plugins/perl/perl-common.h src/gtkthemes.h src/protocols/zephyr/error_table.h src/protocols/zephyr/zephyr_err.h src/win32/IdleTracker/idletrack.h src/win32/libc_interface.h src/win32/win32dep.h src/win32/wspell.h
diffstat 9 files changed, 57 insertions(+), 52 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/docklet/docklet.h	Fri Dec 16 04:08:05 2005 +0000
+++ b/plugins/docklet/docklet.h	Fri Dec 16 09:02:17 2005 +0000
@@ -49,13 +49,13 @@
 extern GaimPlugin *handle;
 
 /* functions in docklet.c */
-extern void docklet_clicked(int);
-extern void docklet_embedded(void);
-extern void docklet_remove(gboolean);
-extern void docklet_set_ui_ops(struct docklet_ui_ops *);
-extern void docklet_unload(void);
+void docklet_clicked(int);
+void docklet_embedded(void);
+void docklet_remove(gboolean);
+void docklet_set_ui_ops(struct docklet_ui_ops *);
+void docklet_unload(void);
 
 /* function in docklet-{x11,win32}.c */
-extern void docklet_ui_init(void);
+void docklet_ui_init(void);
 
 #endif /* _DOCKLET_H_ */
--- a/plugins/perl/perl-common.h	Fri Dec 16 04:08:05 2005 +0000
+++ b/plugins/perl/perl-common.h	Fri Dec 16 09:02:17 2005 +0000
@@ -18,7 +18,7 @@
 	(is_hvref(o) ? (HV *)SvRV(o) : NULL);
 
 #define GAIM_PERL_BOOT_PROTO(x) \
-	extern void boot_Gaim__##x(pTHX_ CV *cv);
+	void boot_Gaim__##x(pTHX_ CV *cv);
 
 #define GAIM_PERL_BOOT(x) \
 	gaim_perl_callXS(boot_Gaim__##x, cv, mark)
--- a/src/gtkthemes.h	Fri Dec 16 04:08:05 2005 +0000
+++ b/src/gtkthemes.h	Fri Dec 16 09:02:17 2005 +0000
@@ -44,10 +44,10 @@
 extern struct smiley_theme *current_smiley_theme;
 extern GSList *smiley_themes;
 
-extern void gaim_gtkthemes_init(void);
+void gaim_gtkthemes_init(void);
 gboolean gaim_gtkthemes_smileys_disabled(void);
-extern void gaim_gtkthemes_smiley_themeize(GtkWidget *);
-extern void gaim_gtkthemes_smiley_theme_probe(void);
-extern void gaim_gtkthemes_load_smiley_theme(const char *file, gboolean load);
-extern GSList *gaim_gtkthemes_get_proto_smileys(const char *id);
+void gaim_gtkthemes_smiley_themeize(GtkWidget *);
+void gaim_gtkthemes_smiley_theme_probe(void);
+void gaim_gtkthemes_load_smiley_theme(const char *file, gboolean load);
+GSList *gaim_gtkthemes_get_proto_smileys(const char *id);
 #endif /* _GAIM_GTKDIALOGS_H_ */
--- a/src/protocols/zephyr/error_table.h	Fri Dec 16 04:08:05 2005 +0000
+++ b/src/protocols/zephyr/error_table.h	Fri Dec 16 09:02:17 2005 +0000
@@ -20,6 +20,6 @@
 #define	ERRCODE_RANGE	8	/* # of bits to shift table number */
 #define	BITS_PER_CHAR	6	/* # bits to shift per character in name */
 
-extern const char *error_table_name(void);
+const char *error_table_name(void);
 #define _ET_H
 #endif
--- a/src/protocols/zephyr/zephyr_err.h	Fri Dec 16 04:08:05 2005 +0000
+++ b/src/protocols/zephyr/zephyr_err.h	Fri Dec 16 09:02:17 2005 +0000
@@ -25,7 +25,7 @@
 #define ZERR_NOMORESUBSCRIPTIONS                 (-772103660L)
 #define ZERR_TOOMANYSUBS                         (-772103659L)
 #define ZERR_EOF                                 (-772103658L)
-extern void initialize_zeph_error_table (void);
+void initialize_zeph_error_table (void);
 #define ERROR_TABLE_BASE_zeph (-772103680L)
 
 /* for compatibility with older versions... */
--- a/src/win32/IdleTracker/idletrack.h	Fri Dec 16 04:08:05 2005 +0000
+++ b/src/win32/IdleTracker/idletrack.h	Fri Dec 16 09:02:17 2005 +0000
@@ -3,6 +3,6 @@
  */
 #include <windows.h>
 
-extern DWORD wgaim_get_lastactive(void);
-extern BOOL wgaim_set_idlehooks(void);
-extern void wgaim_remove_idlehooks(void);
+DWORD wgaim_get_lastactive(void);
+BOOL wgaim_set_idlehooks(void);
+void wgaim_remove_idlehooks(void);
--- a/src/win32/libc_interface.h	Fri Dec 16 04:08:05 2005 +0000
+++ b/src/win32/libc_interface.h	Fri Dec 16 09:02:17 2005 +0000
@@ -30,45 +30,45 @@
 #include <glib.h>
 
 /* sys/socket.h */
-extern int wgaim_socket(int namespace, int style, int protocol);
+int wgaim_socket(int namespace, int style, int protocol);
 #define socket( namespace, style, protocol ) \
 wgaim_socket( namespace, style, protocol )
 
-extern int wgaim_connect(int socket, struct sockaddr *addr, u_long length);
+int wgaim_connect(int socket, struct sockaddr *addr, u_long length);
 #define connect( socket, addr, length ) \
 wgaim_connect( socket, addr, length )
 
-extern int wgaim_getsockopt(int socket, int level, int optname, void *optval, socklen_t *optlenptr);
+int wgaim_getsockopt(int socket, int level, int optname, void *optval, socklen_t *optlenptr);
 #define getsockopt( args... ) \
 wgaim_getsockopt( args )
 
-extern int wgaim_setsockopt(int socket, int level, int optname, const void *optval, socklen_t optlen);
+int wgaim_setsockopt(int socket, int level, int optname, const void *optval, socklen_t optlen);
 #define setsockopt( args... ) \
 wgaim_setsockopt( args )
 
-extern int wgaim_getsockname (int socket, struct sockaddr *addr, socklen_t *lenptr);
+int wgaim_getsockname (int socket, struct sockaddr *addr, socklen_t *lenptr);
 #define getsockname( socket, addr, lenptr ) \
 wgaim_getsockname( socket, addr, lenptr )
 
-extern int wgaim_bind(int socket, struct sockaddr *addr, socklen_t length);
+int wgaim_bind(int socket, struct sockaddr *addr, socklen_t length);
 #define bind( socket, addr, length ) \
 wgaim_bind( socket, addr, length )
 
-extern int wgaim_listen(int socket, unsigned int n);
+int wgaim_listen(int socket, unsigned int n);
 #define listen( socket, n ) \
 wgaim_listen( socket, n )
 
-extern int wgaim_sendto(int socket, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen);
+int wgaim_sendto(int socket, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen);
 #define sendto(socket, buf, len, flags, to, tolen) \
 wgaim_sendto(socket, buf, len, flags, to, tolen)
 
 /* sys/ioctl.h */
-extern int wgaim_ioctl(int fd, int command, void* opt);
+int wgaim_ioctl(int fd, int command, void* opt);
 #define ioctl( fd, command, val ) \
 wgaim_ioctl( fd, command, val )
 
 /* fcntl.h */
-extern int wgaim_fcntl(int socket, int command, int val);
+int wgaim_fcntl(int socket, int command, int val);
 #define fcntl( fd, command, val ) \
 wgaim_fcntl( fd, command, val )
 
@@ -77,12 +77,12 @@
 #endif
 
 /* arpa/inet.h */
-extern int wgaim_inet_aton(const char *name, struct in_addr *addr);
+int wgaim_inet_aton(const char *name, struct in_addr *addr);
 #define inet_aton( name, addr ) \
 wgaim_inet_aton( name, addr )
 
 /* netdb.h */
-extern struct hostent* wgaim_gethostbyname(const char *name);
+struct hostent* wgaim_gethostbyname(const char *name);
 #define gethostbyname( name ) \
 wgaim_gethostbyname( name )
 
@@ -91,7 +91,7 @@
 (unsigned int)ntohl( netlong )
 
 /* string.h */
-extern char* wgaim_strerror( int errornum );
+char* wgaim_strerror( int errornum );
 #define hstrerror( herror ) \
 wgaim_strerror( errno )
 #define strerror( errornum ) \
@@ -100,15 +100,15 @@
 #define bzero( dest, size ) memset( dest, 0, size )
 
 /* unistd.h */
-extern int wgaim_read(int fd, void *buf, unsigned int size);
+int wgaim_read(int fd, void *buf, unsigned int size);
 #define read( fd, buf, buflen ) \
 wgaim_read( fd, buf, buflen )
 
-extern int wgaim_write(int fd, const void *buf, unsigned int size);
+int wgaim_write(int fd, const void *buf, unsigned int size);
 #define write( socket, buf, buflen ) \
 wgaim_write( socket, buf, buflen )
 
-extern int wgaim_close(int fd);
+int wgaim_close(int fd);
 #define close( fd ) \
 wgaim_close( fd )
 
@@ -116,12 +116,12 @@
 #define sleep(x) Sleep((x)*1000)
 #endif
 
-extern int wgaim_gethostname(char *name, size_t size);
+int wgaim_gethostname(char *name, size_t size);
 #define gethostname( name, size ) \
 wgaim_gethostname( name, size )
 
 /* sys/time.h */
-extern int wgaim_gettimeofday(struct timeval *p, struct timezone *z);
+int wgaim_gettimeofday(struct timeval *p, struct timezone *z);
 #define gettimeofday( timeval, timezone ) \
 wgaim_gettimeofday( timeval, timezone )
 
@@ -129,7 +129,7 @@
 #define snprintf _snprintf
 #define vsnprintf _vsnprintf
 
-extern int wgaim_rename(const char *oldname, const char *newname);
+int wgaim_rename(const char *oldname, const char *newname);
 #define rename( oldname, newname ) \
 wgaim_rename( oldname, newname )
 
@@ -151,7 +151,7 @@
 #define fchmod(a,b)
 
 /* time.h */
-extern struct tm *wgaim_localtime_r(const time_t *time, struct tm *resultp);
+struct tm *wgaim_localtime_r(const time_t *time, struct tm *resultp);
 #define localtime_r( time, resultp ) \
 wgaim_localtime_r( time, resultp )
 
--- a/src/win32/win32dep.h	Fri Dec 16 04:08:05 2005 +0000
+++ b/src/win32/win32dep.h	Fri Dec 16 09:02:17 2005 +0000
@@ -36,24 +36,29 @@
  ** win32dep.c
  **/
 /* Windows helper functions */
-extern HINSTANCE wgaim_hinstance(void);
-extern FARPROC   wgaim_find_and_loadproc(char*, char*);
-extern gboolean  wgaim_read_reg_string(HKEY key, char* sub_key, char* val_name, LPBYTE data, LPDWORD data_len);
-extern char*     wgaim_escape_dirsep(char*);
+HINSTANCE wgaim_hinstance(void);
+FARPROC   wgaim_find_and_loadproc(char*, char*);
+gboolean  wgaim_read_reg_string(HKEY key, char* sub_key, char* val_name, LPBYTE data, LPDWORD data_len);
+char*     wgaim_escape_dirsep(char*);
+
 /* Determine Gaim paths */
-extern char*     wgaim_get_special_folder(int folder_type); /* needs to be g_free'd */
-extern char*     wgaim_install_dir(void);
-extern char*     wgaim_lib_dir(void);
-extern char*     wgaim_locale_dir(void);
-extern char*     wgaim_data_dir(void);
+char*     wgaim_get_special_folder(int folder_type); /* needs to be g_free'd */
+char*     wgaim_install_dir(void);
+char*     wgaim_lib_dir(void);
+char*     wgaim_locale_dir(void);
+char*     wgaim_data_dir(void);
+
 /* Utility */
-extern int       wgaim_gz_decompress(const char* in, const char* out);
-extern int       wgaim_gz_untar(const char* filename, const char* destdir);
+int       wgaim_gz_decompress(const char* in, const char* out);
+int       wgaim_gz_untar(const char* filename, const char* destdir);
+
 /* Misc */
-extern void      wgaim_notify_uri(const char *uri);
+void      wgaim_notify_uri(const char *uri);
+
 /* init / cleanup */
-extern void      wgaim_init(HINSTANCE);
-extern void      wgaim_cleanup(void);
+void      wgaim_init(HINSTANCE);
+void      wgaim_cleanup(void);
+
 
 /*
  *  MACROS
--- a/src/win32/wspell.h	Fri Dec 16 04:08:05 2005 +0000
+++ b/src/win32/wspell.h	Fri Dec 16 09:02:17 2005 +0000
@@ -24,7 +24,7 @@
 #define _WSPELL_H_
 #include <gtkspell/gtkspell.h>
 
-extern void wgaim_gtkspell_init(void);
+void wgaim_gtkspell_init(void);
 
 extern GtkSpell* (*wgaim_gtkspell_new_attach)(GtkTextView*, const gchar*, GError**);
 #define gtkspell_new_attach( view, lang, error ) \