From: Julian Andres Klode <jak@jak-linux.org>
Date: Thu, 6 Oct 2011 19:08:48 +0000 (+0200)
Subject: Remove some useless casts from and to void pointers
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=4c6f142e85969708983e2ffd7d413e01ac84b176;p=ext%2Fsubsurface.git

Remove some useless casts from and to void pointers

Remove casts from/to void*.  They are unneeded in C, can hide problems
in the future, and are far too C++ish.  Furthermore, they were
inconsistent with the rest of the code and even with regards to
themselves (at least in terms of whether or not to have space after the
cast).

In this case, we temporarily lose const specifiers in libdivecomputer.c
due to the unneeded cast, so it seems better to avoid the cast at all,
so you get warned about a const->non-const cast if you ever change it to
do something like this.

The casts in gtk-gui.c are just useless semantically, although they
might be useful as a hint to the reader that the void pointers are char
arrays.

Signed-off-by: Julian Andres Klode <jak@jak-linux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/gtk-gui.c b/gtk-gui.c
index b889f11..4ac538a 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -116,7 +116,7 @@ static void file_open(GtkWidget *w, gpointer data)
 		
 		GError *error = NULL;
 		while(filenames != NULL) {
-			filename = (char *)filenames->data;
+			filename = filenames->data;
 			parse_xml_file(filename, &error);
 			if (error != NULL)
 			{
@@ -883,7 +883,7 @@ static GtkWidget *xml_file_selector(GtkWidget *vbox, GtkWidget *main_dialog)
 static void do_import_file(gpointer data, gpointer user_data)
 {
 	GError *error = NULL;
-	parse_xml_file((char *)data, &error);
+	parse_xml_file(data, &error);
 
 	if (error != NULL)
 	{
diff --git a/libdivecomputer.c b/libdivecomputer.c
index bcf59ee..b1c86c5 100644
--- a/libdivecomputer.c
+++ b/libdivecomputer.c
@@ -411,10 +411,10 @@ static device_status_t device_open(const char *devname,
 
 static void event_cb(device_t *device, device_event_t event, const void *data, void *userdata)
 {
-	const device_progress_t *progress = (device_progress_t *) data;
-	const device_devinfo_t *devinfo = (device_devinfo_t *) data;
-	const device_clock_t *clock = (device_clock_t *) data;
-	device_data_t *devdata = (device_data_t *) userdata;
+	const device_progress_t *progress = data;
+	const device_devinfo_t *devinfo = data;
+	const device_clock_t *clock = data;
+	device_data_t *devdata = userdata;
 
 	switch (event) {
 	case DEVICE_EVENT_WAITING: