mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
* 'forlinus' of git://git.hohndel.org/subsurface:
  Return is not a function
This commit is contained in:
Linus Torvalds 2011-12-14 21:06:00 -08:00
commit b5139aeb22
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gtk-gui.c
View file

@ -858,7 +858,7 @@ int process_ui_events(void)
break; break;
} }
} }
return(ret); return ret;
} }

4
info.c
View file

@ -38,8 +38,8 @@ static char *get_text(GtkTextView *view)
* NOTW: NULL and "" need to be treated as "unchanged" */ * NOTW: NULL and "" need to be treated as "unchanged" */
static int text_changed(const char *old, const char *new) static int text_changed(const char *old, const char *new)
{ {
return ((old && strcmp(old,new)) || return (old && strcmp(old,new)) ||
(!old && strcmp("",new))); (!old && strcmp("",new));
} }
static char *get_combo_box_entry_text(GtkComboBoxEntry *combo_box, char **textp) static char *get_combo_box_entry_text(GtkComboBoxEntry *combo_box, char **textp)

2
linux.c
View file

@ -49,5 +49,5 @@ void subsurface_close_conf(void)
const char *subsurface_USB_name() const char *subsurface_USB_name()
{ {
return("/dev/ttyUSB0"); return "/dev/ttyUSB0";
} }

2
macos.c
View file

@ -92,5 +92,5 @@ void subsurface_close_conf(void)
const char *subsurface_USB_name() const char *subsurface_USB_name()
{ {
return("/dev/tty.SLAB_USBtoUART"); return "/dev/tty.SLAB_USBtoUART";
} }

2
uemis.c
View file

@ -88,7 +88,7 @@ static int pressure_to_depth(uint16_t value)
atm = bar_to_atm(value / 100.0); atm = bar_to_atm(value / 100.0);
cm = 100 * atm + 0.5; cm = 100 * atm + 0.5;
return( (cm > 0) ? 10 * (long)cm : 0); return (cm > 0) ? 10 * (long)cm : 0;
} }
/* /*

2
windows.c
View file

@ -81,5 +81,5 @@ void subsurface_close_conf(void)
const char *subsurface_USB_name() const char *subsurface_USB_name()
{ {
return("COM3"); return "COM3";
} }