mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename the project 'subsurface'

Browse source 
I never really liked 'diveclog' as a name - it's not like the C part is
all that important.  And while I could try to just make up another slang
word for despicable person (in the tradition of naming all my projects
after myself), I just can't see it.

So let's just call it "subsurface".

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2011-09-15 09:43:14 -07:00
parent efb1fa44b8
commit 3a6652634b
7 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,2 +1,2 @@
*.o *.o
/divelog /subsurface

4
Makefile
View file

@ -8,8 +8,8 @@ LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
OBJS = main.o dive.o profile.o info.o equipment.o divelist.o \ OBJS = main.o dive.o profile.o info.o equipment.o divelist.o \
parse-xml.o save-xml.o libdivecomputer.o print.o uemis.o parse-xml.o save-xml.o libdivecomputer.o print.o uemis.o
divelog: $(OBJS) subsurface: $(OBJS)
$(CC) $(LDFLAGS) -o divelog $(OBJS) \ $(CC) $(LDFLAGS) -o subsurface $(OBJS) \
`xml2-config --libs` \ `xml2-config --libs` \
`pkg-config --libs gtk+-2.0 glib-2.0 gconf-2.0` \ `pkg-config --libs gtk+-2.0 glib-2.0 gconf-2.0` \
$(LIBDIVECOMPUTERARCHIVE) $(LIBDIVECOMPUTERARCHIVE)

10
README
View file

@ -18,7 +18,7 @@ You also need to have libdivecomputer installed, which goes something like this:
Usage: Usage:
make make
./divelog dives/*.xml ./subsurface dives/*.xml
to see my dives (with no notes or commentary). to see my dives (with no notes or commentary).
@ -26,15 +26,15 @@ Or, if you have a dive computer supported by libdivecomputer (and
connected to /dev/ttyUSB0), you can just do connected to /dev/ttyUSB0), you can just do
make make
./divelog ./subsurface
and select "Import" from the File menu, tell it what dive computer you and select "Import" from the File menu, tell it what dive computer you
have, and hit "OK". have, and hit "OK".
There's a lot of duplicates in the XML files that come as an example, There's a lot of duplicates in the XML files that come as an example,
and divelog will de-duplicate the ones that are exactly the same (just and subsurface will de-duplicate the ones that are exactly the same
because they were imported multiple times). But at least two of the (just because they were imported multiple times). But at least two of
dives have duplicates that were edited by Dirk in the Suunto Dive the dives have duplicates that were edited by Dirk in the Suunto Dive
Manager, so they don't trigger the "exact duplicates" match. Manager, so they don't trigger the "exact duplicates" match.
WARNING! I wasn't kidding when I said that I've done this by reading WARNING! I wasn't kidding when I said that I've done this by reading

2
libdivecomputer.c
View file

@ -40,7 +40,7 @@ static void error(const char *fmt, ...)
va_start(args, fmt); va_start(args, fmt);
error = g_error_new_valist( error = g_error_new_valist(
g_quark_from_string("divelog"), g_quark_from_string("subsurface"),
DIVE_ERROR_PARSE, fmt, args); DIVE_ERROR_PARSE, fmt, args);
va_end(args); va_end(args);
report_error(error); report_error(error);

2
main.c
View file

@ -19,7 +19,7 @@ struct DiveList dive_list;
GConfClient *gconf; GConfClient *gconf;
struct units output_units; struct units output_units;
#define GCONF_NAME(x) "/apps/diveclog/" #x #define GCONF_NAME(x) "/apps/subsurface/" #x
static int sortfn(const void *_a, const void *_b) static int sortfn(const void *_a, const void *_b)
{ {

4
parse-xml.c
View file

@ -521,7 +521,7 @@ static void fahrenheit(char *buffer, void *_temperature)
* pressures are in PSI. But the tank working pressure is in * pressures are in PSI. But the tank working pressure is in
* bar. WTF^2? * bar. WTF^2?
* *
* Crazy stuff like this is why diveclog has everything in * Crazy stuff like this is why subsurface has everything in
* these inconvenient typed structures, and you have to say * these inconvenient typed structures, and you have to say
* "pressure->mbar" to get the actual value. Exactly so that * "pressure->mbar" to get the actual value. Exactly so that
* you can never have unit confusion. * you can never have unit confusion.
@ -1357,7 +1357,7 @@ void parse_xml_file(const char *filename, GError **error)
fprintf(stderr, "Failed to parse '%s'.\n", filename); fprintf(stderr, "Failed to parse '%s'.\n", filename);
if (error != NULL) if (error != NULL)
{ {
*error = g_error_new(g_quark_from_string("divelog"), *error = g_error_new(g_quark_from_string("subsurface"),
DIVE_ERROR_PARSE, DIVE_ERROR_PARSE,
"Failed to parse '%s'", "Failed to parse '%s'",
filename); filename);

2
save-xml.c
View file

@ -236,7 +236,7 @@ void save_dives(const char *filename)
/* Flush any edits of current dives back to the dives! */ /* Flush any edits of current dives back to the dives! */
update_dive(current_dive); update_dive(current_dive);
fprintf(f, "<dives>\n<program name='diveclog' version='%d'></program>\n", VERSION); fprintf(f, "<dives>\n<program name='subsurface' version='%d'></program>\n", VERSION);
for (i = 0; i < dive_table.nr; i++) for (i = 0; i < dive_table.nr; i++)
save_dive(f, get_dive(i)); save_dive(f, get_dive(i));
fprintf(f, "</dives>\n"); fprintf(f, "</dives>\n");