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

Move the variable initialisations closer to use and add blanks

Browse source 
Makes the code easier to read, IMHO.

Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Thiago Macieira 2013-12-19 17:03:24 -08:00 • committed by Dirk Hohndel
parent de47937dd1
commit 64f24234ab
1 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
qt-ui/subsurfacewebservices.cpp
View file

@ -106,15 +106,7 @@ bool DivelogsDeWebServices::prepare_dives_for_divelogs(const QString &tempfile,
return false; return false;
} }
int i;
struct dive *dive;
FILE *f;
char filename[PATH_MAX];
int streamsize;
char *membuf;
xsltStylesheetPtr xslt = NULL; xsltStylesheetPtr xslt = NULL;
xmlDoc *transformed;
struct zip_source *s[dive_table.nr];
struct zip *zip; struct zip *zip;
xslt = get_stylesheet("divelogs-export.xslt"); xslt = get_stylesheet("divelogs-export.xslt");
@ -135,8 +127,19 @@ bool DivelogsDeWebServices::prepare_dives_for_divelogs(const QString &tempfile,
} }
/* walk the dive list in chronological order */ /* walk the dive list in chronological order */
for (i = 0; i < dive_table.nr; i++) { for (int i = 0; i < dive_table.nr; i++) {
dive = get_dive(i); FILE *f;
char filename[PATH_MAX];
int streamsize;
char *membuf;
xmlDoc *transformed;
struct zip_source *s[dive_table.nr];
/*
* Get the i'th dive in XML format so we can process it.
* We need to save to a file before we can reload it back into memory...
*/
struct dive *dive = get_dive(i);
if (!dive) if (!dive)
continue; continue;
if (selected && !dive->selected) if (selected && !dive->selected)
@ -150,6 +153,7 @@ bool DivelogsDeWebServices::prepare_dives_for_divelogs(const QString &tempfile,
fseek(f, 0, SEEK_END); fseek(f, 0, SEEK_END);
streamsize = ftell(f); streamsize = ftell(f);
rewind(f); rewind(f);
membuf = (char *)malloc(streamsize + 1); membuf = (char *)malloc(streamsize + 1);
if (!membuf || !fread(membuf, streamsize, 1, f)) { if (!membuf || !fread(membuf, streamsize, 1, f)) {
*errorMsg = tr("internal error: %1").arg(qt_error_string()); *errorMsg = tr("internal error: %1").arg(qt_error_string());
@ -159,6 +163,7 @@ bool DivelogsDeWebServices::prepare_dives_for_divelogs(const QString &tempfile,
} }
membuf[streamsize] = 0; membuf[streamsize] = 0;
fclose(f); fclose(f);
/* /*
* Parse the memory buffer into XML document and * Parse the memory buffer into XML document and
* transform it to divelogs.de format, finally dumping * transform it to divelogs.de format, finally dumping
@ -172,10 +177,12 @@ bool DivelogsDeWebServices::prepare_dives_for_divelogs(const QString &tempfile,
goto error_close_zip; goto error_close_zip;
} }
free((void *)membuf); free((void *)membuf);
transformed = xsltApplyStylesheet(xslt, doc, NULL); transformed = xsltApplyStylesheet(xslt, doc, NULL);
xmlDocDumpMemory(transformed, (xmlChar **) &membuf, &streamsize); xmlDocDumpMemory(transformed, (xmlChar **) &membuf, &streamsize);
xmlFreeDoc(doc); xmlFreeDoc(doc);
xmlFreeDoc(transformed); xmlFreeDoc(transformed);
/* /*
* Save the XML document into a zip file. * Save the XML document into a zip file.
*/ */