G_GNUC_NORETURN love.

* include/glibtop/error.h: G_GNUC_NORETURN love.

	* include/glibtop/errors.h:
	* lib/errors.c: Bye bye dead code.

ChangeLog

@@ -1,3 +1,10 @@
+2005-02-15  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* include/glibtop/error.h: G_GNUC_NORETURN love.
+
+	* include/glibtop/errors.h:
+	* lib/errors.c: Bye bye dead code.
+
 2005-02-06  Benoît Dejean  <TazForEver@dlfp.org>
 
 	* NEWS:

include/glibtop/error.h

@@ -28,19 +28,19 @@
 
 G_BEGIN_DECLS
 
-void glibtop_error_vr (glibtop *server, const char *format, va_list args);
+void glibtop_error_vr (glibtop *server, const char *format, va_list args) G_GNUC_NORETURN;
 void glibtop_warn_vr (glibtop *server, const char *format, va_list args);
-void glibtop_error_io_vr (glibtop *server, const char *format, int, va_list args);
+void glibtop_error_io_vr (glibtop *server, const char *format, int, va_list args) G_GNUC_NORETURN;
 void glibtop_warn_io_vr (glibtop *server, const char *format, int, va_list args);
 
-void glibtop_error_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
+void glibtop_error_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
 void glibtop_warn_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
-void glibtop_error_io_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
+void glibtop_error_io_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
 void glibtop_warn_io_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
 
-void glibtop_error (const char *format, ...) G_GNUC_PRINTF(1, 2);
+void glibtop_error (const char *format, ...) G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
 void glibtop_warn (const char *format, ...) G_GNUC_PRINTF(1, 2);
-void glibtop_error_io (const char *format, ...) G_GNUC_PRINTF(1, 2);
+void glibtop_error_io (const char *format, ...) G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
 void glibtop_warn_io (const char *format, ...) G_GNUC_PRINTF(1, 2);
 
 G_END_DECLS

include/glibtop/errors.h

@@ -1,95 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_ERRORS_H__
-#define __GLIBTOP_ERRORS_H__
-
-#include <glibtop.h>
-
-#include <glib/gerror.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_ERROR glibtop_error_quark ()
-
-GQuark glibtop_error_quark (void) G_GNUC_CONST;
-
-typedef enum {
-    GLIBTOP_ERROR_NO_ERROR = 0,
-    GLIBTOP_ERROR_UNKNOWN,
-    GLIBTOP_ERROR_INVALID_ARGUMENT,
-    GLIBTOP_ERROR_NO_SUCH_PARAMETER,
-    GLIBTOP_ERROR_READONLY_VALUE,
-    GLIBTOP_ERROR_SIZE_MISMATCH,
-
-    GLIBTOP_ERROR_SERVER_COMM_FAILURE,
-
-    GLIBTOP_ERROR_NO_SUCH_PROCESS,
-
-    GLIBTOP_ERROR_NO_KERNEL_SUPPORT,
-    GLIBTOP_ERROR_INCOMPATIBLE_KERNEL,
-
-    GLIBTOP_ERROR_NO_SUCH_BACKEND,
-    GLIBTOP_ERROR_NOT_IMPLEMENTED,
-    GLIBTOP_ERROR_NO_BACKEND_OPENED,
-
-    GLIBTOP_ERROR_DEMARSHAL_ERROR
-} glibtop_error;
-
-void
-glibtop_error_vl (glibtop_client *client, glibtop_error code,
-		  const char *format, va_list args);
-
-void
-glibtop_error_io_vl (glibtop_client *client, glibtop_error code,
-		     int io_errno, const char *format, va_list args);
-
-void
-glibtop_warn_vl (glibtop_client *client, glibtop_error code,
-		 const char *format, va_list args);
-
-void
-glibtop_warn_io_vl (glibtop_client *client, glibtop_error code,
-		    int io_errno, const char *format, va_list args);
-
-void
-glibtop_error_l (glibtop_client *client, glibtop_error code,
-		 char *format, ...);
-
-void
-glibtop_warn_l (glibtop_client *client, glibtop_error code,
-		char *format, ...);
-
-void
-glibtop_error_io_l (glibtop_client *client, glibtop_error code,
-		    char *format, ...);
-
-void
-glibtop_warn_io_l (glibtop_client *client, glibtop_error code,
-		   char *format, ...);
-
-G_END_DECLS
-
-#endif

lib/errors.c

@@ -1,156 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-#include <glibtop/errors.h>
-
-/* Error quark */
-GQuark
-glibtop_error_quark (void)
-{
-    static GQuark q = 0;
-    if (G_UNLIKELY(q == 0))
-	q = g_quark_from_static_string ("glibtop-error-quark");
-
-    return q;
-}
-
-void
-glibtop_error_vl (glibtop_client *client, glibtop_error code,
-		  const char *format, va_list args)
-{
-    gchar *message;
-    GError *error;
-
-    g_return_if_fail (GLIBTOP_IS_CLIENT (client));
-    message = g_strdup_vprintf (format, args);
-
-    error = g_error_new_literal (GLIBTOP_ERROR, code, message);
-    glibtop_client_propagate_error (client, error);
-
-    g_error_free (error);
-    g_free (message);
-}
-
-void
-glibtop_error_io_vl (glibtop_client *client, glibtop_error code,
-		     int io_errno, const char *format, va_list args)
-{
-    gchar *message, *fullmessage;
-    GError *error;
-
-    g_return_if_fail (GLIBTOP_IS_CLIENT (client));
-    message = g_strdup_vprintf (format, args);
-    fullmessage = g_strdup_printf ("%s: %s", message, strerror (io_errno));
-
-    error = g_error_new_literal (GLIBTOP_ERROR, code, message);
-    glibtop_client_propagate_error (client, error);
-
-    g_error_free (error);
-    g_free (fullmessage);
-    g_free (message);
-}
-
-void
-glibtop_warn_vl (glibtop_client *client, glibtop_error code,
-		 const char *format, va_list args)
-{
-    gchar *message;
-    GError *error;
-
-    g_return_if_fail (GLIBTOP_IS_CLIENT (client));
-    message = g_strdup_vprintf (format, args);
-
-    error = g_error_new_literal (GLIBTOP_ERROR, code, message);
-    glibtop_client_propagate_warning (client, error);
-
-    g_error_free (error);
-    g_free (message);
-}
-
-void
-glibtop_warn_io_vl (glibtop_client *client, glibtop_error code,
-		    int io_errno, const char *format, va_list args)
-{
-    gchar *message, *fullmessage;
-    GError *error;
-
-    g_return_if_fail (GLIBTOP_IS_CLIENT (client));
-    message = g_strdup_vprintf (format, args);
-    fullmessage = g_strdup_printf ("%s: %s", message, strerror (io_errno));
-
-    error = g_error_new_literal (GLIBTOP_ERROR, code, message);
-    glibtop_client_propagate_warning (client, error);
-
-    g_error_free (error);
-    g_free (fullmessage);
-    g_free (message);
-}
-
-void
-glibtop_error_l (glibtop_client *client, glibtop_error code,
-		 char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_error_vl (client, code, format, args);
-    va_end (args);
-}
-
-void
-glibtop_warn_l (glibtop_client *client, glibtop_error code,
-		char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_warn_vl (client, code, format, args);
-    va_end (args);
-}
-
-void
-glibtop_error_io_l (glibtop_client *client, glibtop_error code,
-		    char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_error_io_vl (client, code, errno, format, args);
-    va_end (args);
-}
-
-void
-glibtop_warn_io_l (glibtop_client *client, glibtop_error code,
-		   char *format, ...)
-{
-    va_list args;
-
-    va_start (args, format);
-    glibtop_warn_io_vl (client, code, errno, format, args);
-    va_end (args);
-}
-