Mercurial Mercurial > upstream > oracle > spec-files / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/libgtop-01-solaris.diff
changeset 9988 a349549365dc
parent 9929 8c01771021fc
child 11477 18198fb39803 
--- a/patches/libgtop-01-solaris.diff	Tue Jun 05 13:55:11 2007 +0000
+++ b/patches/libgtop-01-solaris.diff	Tue Jun 05 15:11:41 2007 +0000
@@ -1,41 +1,3 @@
-diff -Nrup libgtop-2.19.2/include/glibtop/error.h libgtop-2.19.2.mod/include/glibtop/error.h
---- libgtop-2.19.2/include/glibtop/error.h	2007-04-27 06:27:30.000000000 +0800
-+++ libgtop-2.19.2.mod/include/glibtop/error.h	2007-05-18 15:42:44.742763000 +0800
-@@ -31,20 +31,20 @@
- 
- G_BEGIN_DECLS
- 
--void glibtop_error_vr (glibtop *server, const char *format, va_list args) G_GNUC_INTERNAL G_GNUC_NORETURN;
--void glibtop_warn_vr (glibtop *server, const char *format, va_list args) G_GNUC_INTERNAL;
--void glibtop_error_io_vr (glibtop *server, const char *format, int, va_list args) G_GNUC_INTERNAL G_GNUC_NORETURN;
--void glibtop_warn_io_vr (glibtop *server, const char *format, int, va_list args) G_GNUC_INTERNAL;
--
--void glibtop_error_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
--void glibtop_warn_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);
--void glibtop_error_io_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
--void glibtop_warn_io_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);
--
--void glibtop_error (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
--void glibtop_warn (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2);
--void glibtop_error_io (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
--void glibtop_warn_io (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2);
-+G_GNUC_INTERNAL void glibtop_error_vr (glibtop *server, const char *format, va_list args)  G_GNUC_NORETURN;
-+G_GNUC_INTERNAL void glibtop_warn_vr (glibtop *server, const char *format, va_list args) ;
-+G_GNUC_INTERNAL void glibtop_error_io_vr (glibtop *server, const char *format, int, va_list args)  G_GNUC_NORETURN;
-+G_GNUC_INTERNAL void glibtop_warn_io_vr (glibtop *server, const char *format, int, va_list args) ;
-+
-+G_GNUC_INTERNAL void glibtop_error_r (glibtop *server, const char *format, ...)  G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
-+G_GNUC_INTERNAL void glibtop_warn_r (glibtop *server, const char *format, ...)  G_GNUC_PRINTF(2, 3);
-+G_GNUC_INTERNAL void glibtop_error_io_r (glibtop *server, const char *format, ...)  G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
-+G_GNUC_INTERNAL void glibtop_warn_io_r (glibtop *server, const char *format, ...)  G_GNUC_PRINTF(2, 3);
-+
-+G_GNUC_INTERNAL void glibtop_error (const char *format, ...)  G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
-+G_GNUC_INTERNAL void glibtop_warn (const char *format, ...)  G_GNUC_PRINTF(1, 2);
-+G_GNUC_INTERNAL void glibtop_error_io (const char *format, ...)  G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
-+G_GNUC_INTERNAL void glibtop_warn_io (const char *format, ...)  G_GNUC_PRINTF(1, 2);
- 
- G_END_DECLS
- 
 diff -Nrup libgtop-2.19.2/include/glibtop/procstate.h libgtop-2.19.2.mod/include/glibtop/procstate.h
 --- libgtop-2.19.2/include/glibtop/procstate.h	2007-04-27 06:27:30.000000000 +0800
 +++ libgtop-2.19.2.mod/include/glibtop/procstate.h	2007-05-18 15:45:06.525673000 +0800
@@ -192,37 +154,6 @@
  glibtop_set_parameter_l
 -glibtop_set_parameter_p
  glibtop_sys_siglist
-diff -Nrup libgtop-2.19.2/src/daemon/daemon.h libgtop-2.19.2.mod/src/daemon/daemon.h
---- libgtop-2.19.2/src/daemon/daemon.h	2007-05-13 05:54:57.000000000 +0800
-+++ libgtop-2.19.2.mod/src/daemon/daemon.h	2007-05-18 15:46:48.775528000 +0800
-@@ -57,17 +57,17 @@ G_BEGIN_DECLS
- #define MSG_BUFSZ		sizeof (struct _glibtop_ipc_message)
- #define MSG_MSGSZ		(MSG_BUFSZ - sizeof (long))
- 
--void handle_parent_connection (int s) G_GNUC_INTERNAL;
--void handle_slave_connection (int input, int output) G_GNUC_INTERNAL;
--void handle_slave_command (glibtop_command *cmnd, glibtop_response *resp,
--			   const void *parameter) G_GNUC_INTERNAL ;
--
--void do_output (int s, glibtop_response *resp, off_t offset,
--		size_t data_size, const void *data) G_GNUC_INTERNAL;
--int do_read (int s, void *ptr, size_t total_size) G_GNUC_INTERNAL;
-+G_GNUC_INTERNAL void handle_parent_connection (int s) ;
-+G_GNUC_INTERNAL void handle_slave_connection (int input, int output) ;
-+G_GNUC_INTERNAL void handle_slave_command (glibtop_command *cmnd, glibtop_response *resp,
-+			   const void *parameter)  ;
-+
-+G_GNUC_INTERNAL void do_output (int s, glibtop_response *resp, off_t offset,
-+		size_t data_size, const void *data) ;
-+G_GNUC_INTERNAL int do_read (int s, void *ptr, size_t total_size) ;
- 
--void syslog_message (int priority, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);
--void syslog_io_message (int priority, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);
-+G_GNUC_INTERNAL void syslog_message (int priority, const char *format, ...)  G_GNUC_PRINTF(2, 3);
-+G_GNUC_INTERNAL void syslog_io_message (int priority, const char *format, ...)  G_GNUC_PRINTF(2, 3);
- 
- extern gboolean enable_debug;
- extern gboolean verbose_output;
 diff -Nrup libgtop-2.19.2/sysdeps/common/fsusage.c libgtop-2.19.2.mod/sysdeps/common/fsusage.c
 --- libgtop-2.19.2/sysdeps/common/fsusage.c	2007-04-27 06:27:34.000000000 +0800
 +++ libgtop-2.19.2.mod/sysdeps/common/fsusage.c	2007-05-18 15:49:16.128329000 +0800
upstream/oracle/spec-files