[gtk+] Remove trailing whitespace and obsolete doc comments from gdk_error_trap code
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Remove trailing whitespace and obsolete doc comments from gdk_error_trap code
- Date: Sat, 18 Sep 2010 22:21:23 +0000 (UTC)
commit de3512dbba80828e367dd47c532a6ec52146f420
Author: Havoc Pennington <hp pobox com>
Date: Sat Sep 18 16:39:56 2010 -0400
Remove trailing whitespace and obsolete doc comments from gdk_error_trap code
(there are actual docs in the template file, these were some kind of
pre-gtk-doc comments without useful info)
https://bugzilla.gnome.org/show_bug.cgi?id=629608
gdk/x11/gdkmain-x11.c | 41 +++++++++++------------------------------
1 files changed, 11 insertions(+), 30 deletions(-)
---
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index cb9ff04..9c7b6b8 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -291,7 +291,7 @@ _gdk_windowing_exit (void)
* The X error handling routine.
*
* Arguments:
- * "display" is the X display the error orignated from.
+ * "display" is the X display the error originated from.
* "error" is the XErrorEvent that we are handling.
*
* Results:
@@ -316,7 +316,7 @@ gdk_x_error (Display *display,
{
gchar buf[64];
gchar *msg;
-
+
XGetErrorText (display, error->error_code, buf, 63);
msg =
@@ -331,12 +331,12 @@ gdk_x_error (Display *display,
" backtrace from your debugger if you break on the gdk_x_error() function.)",
g_get_prgname (),
buf,
- error->serial,
- error->error_code,
+ error->serial,
+ error->error_code,
error->request_code,
error->minor_code);
-
-#ifdef G_ENABLE_DEBUG
+
+#ifdef G_ENABLE_DEBUG
g_error ("%s", msg);
#else /* !G_ENABLE_DEBUG */
g_fprintf (stderr, "%s\n", msg);
@@ -346,7 +346,7 @@ gdk_x_error (Display *display,
}
_gdk_error_code = error->error_code;
}
-
+
return 0;
}
@@ -398,16 +398,6 @@ gdk_x_io_error (Display *display)
exit(1);
}
-/*************************************************************
- * gdk_error_trap_push:
- * Push an error trap. X errors will be trapped until
- * the corresponding gdk_error_pop(), which will return
- * the error code, if any.
- * arguments:
- *
- * results:
- *************************************************************/
-
void
gdk_error_trap_push (void)
{
@@ -427,7 +417,7 @@ gdk_error_trap_push (void)
node->next = gdk_error_traps;
gdk_error_traps = node;
-
+
trap = node->data;
trap->old_handler = XSetErrorHandler (gdk_x_error);
trap->error_code = _gdk_error_code;
@@ -437,15 +427,6 @@ gdk_error_trap_push (void)
_gdk_error_warnings = 0;
}
-/*************************************************************
- * gdk_error_trap_pop:
- * Pop an error trap added with gdk_error_push()
- * arguments:
- *
- * results:
- * 0, if no error occured, otherwise the error code.
- *************************************************************/
-
gint
gdk_error_trap_pop (void)
{
@@ -460,14 +441,14 @@ gdk_error_trap_pop (void)
node->next = gdk_error_trap_free_list;
gdk_error_trap_free_list = node;
-
+
result = _gdk_error_code;
-
+
trap = node->data;
_gdk_error_code = trap->error_code;
_gdk_error_warnings = trap->error_warnings;
XSetErrorHandler (trap->old_handler);
-
+
return result;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]