Merge branch 'forlinus' of git://git.hohndel.org/subsurface

* 'forlinus' of git://git.hohndel.org/subsurface:
  Return is not a function

6 files changed, 7 insertions, 7 deletions

diff --git a/gtk-gui.c b/gtk-gui.c
index c6b79b690..41e862eb9 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -858,7 +858,7 @@ int process_ui_events(void)
 			break;
 		}
 	}
-	return(ret);
+	return ret;
 }
 
 
diff --git a/info.c b/info.c
index 38087c6e6..e53af015e 100644
--- a/info.c
+++ b/info.c
@@ -38,8 +38,8 @@ static char *get_text(GtkTextView *view)
  * NOTW: NULL and "" need to be treated as "unchanged" */
 static int text_changed(const char *old, const char *new)
 {
-	return ((old && strcmp(old,new)) ||
-		(!old && strcmp("",new)));
+	return (old && strcmp(old,new)) ||
+		(!old && strcmp("",new));
 }
 
 static char *get_combo_box_entry_text(GtkComboBoxEntry *combo_box, char **textp)
diff --git a/linux.c b/linux.c
index e26b3acbd..ac5cf55f9 100644
--- a/linux.c
+++ b/linux.c
@@ -49,5 +49,5 @@ void subsurface_close_conf(void)
 
 const char *subsurface_USB_name()
 {
-	return("/dev/ttyUSB0");
+	return "/dev/ttyUSB0";
 }
diff --git a/macos.c b/macos.c
index 0b64e19a0..25f946c81 100644
--- a/macos.c
+++ b/macos.c
@@ -92,5 +92,5 @@ void subsurface_close_conf(void)
 
 const char *subsurface_USB_name()
 {
-	return("/dev/tty.SLAB_USBtoUART");
+	return "/dev/tty.SLAB_USBtoUART";
 }
diff --git a/uemis.c b/uemis.c
index 86b186043..28302b1c0 100644
--- a/uemis.c
+++ b/uemis.c
@@ -88,7 +88,7 @@ static int pressure_to_depth(uint16_t value)
 
 	atm = bar_to_atm(value / 100.0);
 	cm = 100 * atm + 0.5;
-	return( (cm > 0) ? 10 * (long)cm : 0);
+	return (cm > 0) ? 10 * (long)cm : 0;
 }
 
 /*
diff --git a/windows.c b/windows.c
index 3e40c38ef..8a81737b0 100644
--- a/windows.c
+++ b/windows.c
@@ -81,5 +81,5 @@ void subsurface_close_conf(void)
 
 const char *subsurface_USB_name()
 {
-	return("COM3");
+	return "COM3";
 }