Patch: Uemis fixing whitespace issues

Guido Lerch guido.lerch at gmail.com
Thu Sep 10 11:00:30 PDT 2015


-- 
Best regards,
Guido
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20150910/1475579b/attachment.html>
-------------- next part --------------
From 56bed33f185afdde0d24f48a8180d0ab507063c6 Mon Sep 17 00:00:00 2001
From: glerch <guido.lerch at gmail.com>
Date: Thu, 10 Sep 2015 19:56:58 +0200
Subject: [PATCH 9/9] Uemis - fixing white spaces

no code changes, just fixing white space and an empty line

Signed-off-by: glerch <guido.lerch at gmail.com>
---
 uemis-downloader.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/uemis-downloader.c b/uemis-downloader.c
index 6b51ad2..e1fb92a 100644
--- a/uemis-downloader.c
+++ b/uemis-downloader.c
@@ -71,8 +71,8 @@ static void uemis_ts(char *buffer, void *_when)
 
 	memset(&tm, 0, sizeof(tm));
 	sscanf(buffer, "%d-%d-%dT%d:%d:%d",
-	       &tm.tm_year, &tm.tm_mon, &tm.tm_mday,
-	       &tm.tm_hour, &tm.tm_min, &tm.tm_sec);
+		&tm.tm_year, &tm.tm_mon, &tm.tm_mday,
+		&tm.tm_hour, &tm.tm_min, &tm.tm_sec);
 	tm.tm_mon -= 1;
 	tm.tm_year -= 1900;
 	*when = utc_mktime(&tm);
@@ -118,8 +118,8 @@ static void uemis_add_string(const char *buffer, char **text, const char *delimi
 static void uemis_get_weight(char *buffer, weightsystem_t *weight, int diveid)
 {
 	weight->weight.grams = uemis_get_weight_unit(diveid) ?
-				       lbs_to_grams(ascii_strtod(buffer, NULL)) :
-				       ascii_strtod(buffer, NULL) * 1000;
+					lbs_to_grams(ascii_strtod(buffer, NULL)) :
+					ascii_strtod(buffer, NULL) * 1000;
 	weight->description = strdup(translate("gettextFromC", "unknown"));
 }
 
@@ -327,7 +327,7 @@ static char *next_segment(char *buf, int *offset, int size)
 	while (!done) {
 		if (i < size) {
 			if (i < size - 1 && buf[i] == '\\' &&
-			    (buf[i + 1] == '\\' || buf[i + 1] == '{'))
+				(buf[i + 1] == '\\' || buf[i + 1] == '{'))
 				memcpy(buf + i, buf + i + 1, size - i - 1);
 			else if (buf[i] == '{')
 				done = true;
@@ -445,7 +445,7 @@ static void uemis_increased_timeout(int *timeout)
 
 /* send a request to the dive computer and collect the answer */
 static bool uemis_get_answer(const char *path, char *request, int n_param_in,
-			     int n_param_out, const char **error_text)
+				int n_param_out, const char **error_text)
 {
 	int i = 0, file_length;
 	char sb[BUFLEN];
@@ -475,7 +475,7 @@ static bool uemis_get_answer(const char *path, char *request, int n_param_in,
 	for (i = 0; i < n_param_in; i++)
 		str_append_with_delim(sb, param_buff[i]);
 	if (!strcmp(request, "getDivelogs") || !strcmp(request, "getDeviceData") || !strcmp(request, "getDirectory") ||
-	    !strcmp(request, "getDivespot") || !strcmp(request, "getDive")) {
+		!strcmp(request, "getDivespot") || !strcmp(request, "getDive")) {
 		answer_in_mbuf = true;
 		str_append_with_delim(sb, "");
 		if (!strcmp(request, "getDivelogs"))
@@ -939,8 +939,8 @@ static char *uemis_get_divenr(char *deviceidstr)
 		struct divecomputer *dc;
 		for_each_dc (d, dc) {
 			if (dc->model && !strcmp(dc->model, "Uemis Zurich") &&
-			    (dc->deviceid == 0 || dc->deviceid == 0x7fffffff || dc->deviceid == deviceid) &&
-			    dc->diveid > maxdiveid)
+				(dc->deviceid == 0 || dc->deviceid == 0x7fffffff || dc->deviceid == deviceid) &&
+				dc->diveid > maxdiveid)
 				maxdiveid = dc->diveid;
 		}
 	}
@@ -989,13 +989,12 @@ static bool do_dump_buffer_to_file(char *buf, char *prefix, int round)
  * filenr holds now the uemis filenr after having read several logs including the dive details,
  * fCapacity will five us the average number of files needed for all currently loaded data
  * remember the maximum file usage per dive
- * return : UEMIS_MEM_OK       if there is enough memeory for a full round
- *          UEMIS_MEM_CRITICAL if the memory is good for reading the dive logs
- *          UEMIS_MEM_FULL     if the memory is exhaused
+ * return :	UEMIS_MEM_OK	if there is enough memeory for a full round
+ *		UEMIS_MEM_CRITICAL	if the memory is good for reading the dive logs
+ *		UEMIS_MEM_FULL	if the memory is exhaused
  */
 static int get_memory(struct dive_table *td)
 {
-
 	if (td->nr == 0)
 		return UEMIS_MEM_OK;
 
-- 
1.9.5 (Apple Git-50.3)



More information about the subsurface mailing list