[maemo-commits] [maemo-commits] r16283 - in projects/haf/trunk/sapwood: . engine tests

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Mon Sep 29 19:20:22 EEST 2008
Author: herzi
Date: 2008-09-29 19:20:14 +0300 (Mon, 29 Sep 2008)
New Revision: 16283

Modified:
   projects/haf/trunk/sapwood/ChangeLog
   projects/haf/trunk/sapwood/engine/sapwood-client.h
   projects/haf/trunk/sapwood/engine/sapwood-pixmap.c
   projects/haf/trunk/sapwood/tests/double-free.c
Log:
2008-09-29  Sven Herzberg  <sven at imendio.com>

	Renamed the enumeration value to match the file and library name

	* engine/sapwood-client.h,
	* engine/sapwood-pixmap.c,
	* tests/double-free.c: renamed the enumeration


Modified: projects/haf/trunk/sapwood/ChangeLog
===================================================================
--- projects/haf/trunk/sapwood/ChangeLog	2008-09-29 16:19:58 UTC (rev 16282)
+++ projects/haf/trunk/sapwood/ChangeLog	2008-09-29 16:20:14 UTC (rev 16283)
@@ -1,5 +1,13 @@
 2008-09-29  Sven Herzberg  <sven at imendio.com>
 
+	Renamed the enumeration value to match the file and library name
+
+	* engine/sapwood-client.h,
+	* engine/sapwood-pixmap.c,
+	* tests/double-free.c: renamed the enumeration
+
+2008-09-29  Sven Herzberg  <sven at imendio.com>
+
 	Moved the error enumeration into the shared header
 
 	* engine/sapwood-client.h,

Modified: projects/haf/trunk/sapwood/engine/sapwood-client.h
===================================================================
--- projects/haf/trunk/sapwood/engine/sapwood-client.h	2008-09-29 16:19:58 UTC (rev 16282)
+++ projects/haf/trunk/sapwood/engine/sapwood-client.h	2008-09-29 16:20:14 UTC (rev 16283)
@@ -29,7 +29,7 @@
 G_BEGIN_DECLS
 
 enum {
-    SAPWOOD_PIXMAP_ERROR_FAILED
+    SAPWOOD_CLIENT_ERROR_UNKNOWN
 };
 
 #define SAPWOOD_CLIENT_ERROR  (sapwood_client_get_error_quark ())

Modified: projects/haf/trunk/sapwood/engine/sapwood-pixmap.c
===================================================================
--- projects/haf/trunk/sapwood/engine/sapwood-pixmap.c	2008-09-29 16:19:58 UTC (rev 16282)
+++ projects/haf/trunk/sapwood/engine/sapwood-pixmap.c	2008-09-29 16:20:14 UTC (rev 16283)
@@ -41,7 +41,7 @@
   fd = socket (PF_LOCAL, SOCK_STREAM, 0);
   if (fd < 0)
     {
-      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_PIXMAP_ERROR_FAILED,
+      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_CLIENT_ERROR_UNKNOWN,
 		   "socket: %s", strerror (errno));
       return -1;
     }
@@ -57,7 +57,7 @@
 #endif
   if (connect (fd, (struct sockaddr *)&sun, sizeof (sun)) < 0)
     {
-      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_PIXMAP_ERROR_FAILED,
+      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_CLIENT_ERROR_UNKNOWN,
 		   "Failed to connect to sapwood server using `%s': %s\n\n"
 		   "\t`%s' MUST be started before applications",
 		   sock_path, strerror (errno),
@@ -89,14 +89,14 @@
   n = write (fd, req, reqlen);
   if (n < 0)
     {
-      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_PIXMAP_ERROR_FAILED,
+      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_CLIENT_ERROR_UNKNOWN,
 		   "write: %s", g_strerror (errno));
       return FALSE;
     }
   else if (n != reqlen)
     {
       /* FIXME */
-      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_PIXMAP_ERROR_FAILED,
+      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_CLIENT_ERROR_UNKNOWN,
 		   "wrote %d of %d bytes", n, reqlen);
       return FALSE;
     }
@@ -107,14 +107,14 @@
   n = read (fd, rep, replen);
   if (n < 0)
     {
-      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_PIXMAP_ERROR_FAILED,
+      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_CLIENT_ERROR_UNKNOWN,
 		   "read: %s", g_strerror (errno));
       return FALSE;
     }
   else if (n != replen)
     {
       /* FIXME */
-      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_PIXMAP_ERROR_FAILED,
+      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_CLIENT_ERROR_UNKNOWN,
 		   "read %d, expected %d bytes", n, replen);
       return FALSE;
     }
@@ -141,7 +141,7 @@
   flen = g_strlcpy (req->filename, filename, PATH_MAX);
   if (flen > PATH_MAX)
     {
-      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_PIXMAP_ERROR_FAILED,
+      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_CLIENT_ERROR_UNKNOWN,
 		   "%s: filename too long", filename);
       return NULL;
     }

Modified: projects/haf/trunk/sapwood/tests/double-free.c
===================================================================
--- projects/haf/trunk/sapwood/tests/double-free.c	2008-09-29 16:19:58 UTC (rev 16282)
+++ projects/haf/trunk/sapwood/tests/double-free.c	2008-09-29 16:20:14 UTC (rev 16283)
@@ -49,7 +49,7 @@
   fd = socket (PF_LOCAL, SOCK_STREAM, 0);
   if (fd < 0)
     {
-      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_PIXMAP_ERROR_FAILED,
+      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_CLIENT_ERROR_UNKNOWN,
 		   "socket: %s", strerror (errno));
       return -1;
     }
@@ -65,7 +65,7 @@
 #endif
   if (connect (fd, (struct sockaddr *)&sun, sizeof (sun)) < 0)
     {
-      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_PIXMAP_ERROR_FAILED,
+      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_CLIENT_ERROR_UNKNOWN,
 		   "Failed to connect to sapwood server using `%s': %s\n\n"
 		   "\t`%s' MUST be started before applications",
 		   sock_path, strerror (errno),
@@ -97,14 +97,14 @@
   n = write (fd, req, reqlen);
   if (n < 0)
     {
-      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_PIXMAP_ERROR_FAILED,
+      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_CLIENT_ERROR_UNKNOWN,
 		   "write: %s", g_strerror (errno));
       return FALSE;
     }
   else if (n != reqlen)
     {
       /* FIXME */
-      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_PIXMAP_ERROR_FAILED,
+      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_CLIENT_ERROR_UNKNOWN,
 		   "wrote %d of %d bytes", n, reqlen);
       return FALSE;
     }
@@ -115,21 +115,21 @@
   n = read (fd, rep, replen);
   if (n < 0)
     {
-      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_PIXMAP_ERROR_FAILED,
+      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_CLIENT_ERROR_UNKNOWN,
 		   "read: %s", g_strerror (errno));
       return FALSE;
     }
   else if (n != replen)
     {
       /* FIXME */
-      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_PIXMAP_ERROR_FAILED,
+      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_CLIENT_ERROR_UNKNOWN,
 		   "read %d, expected %d bytes", n, replen);
       return FALSE;
     }
   else if (n != replen)
     {
       /* FIXME */
-      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_PIXMAP_ERROR_FAILED,
+      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_CLIENT_ERROR_UNKNOWN,
 		   "read %d, expected %d bytes", n, replen);
       return FALSE;
     }
@@ -155,7 +155,7 @@
   flen = g_strlcpy (req->filename, filename, PATH_MAX);
   if (flen > PATH_MAX)
     {
-      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_PIXMAP_ERROR_FAILED,
+      g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_CLIENT_ERROR_UNKNOWN,
 		   "%s: filename too long", filename);
       return NULL;
     }


More information about the maemo-commits mailing list