summaryrefslogtreecommitdiffstats
path: root/datatrak.h
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-07-06 13:59:14 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-07-06 13:59:14 -0700
commitb1538c809d0ce5abe489822f9d2b21287a0a38d5 (patch)
tree303fbcb44fbd14d0039293cdc7e9a34e8b2424ba /datatrak.h
parente76675d4df466448a33532895dd371aa498a0e49 (diff)
downloadsubsurface-b1538c809d0ce5abe489822f9d2b21287a0a38d5.tar.gz
Code cleanup
Make precedence of && over || explicit. Explicitly convert between char * and unsigned char *. Don't assign potentially negative return code to an unsigend variable. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'datatrak.h')
-rw-r--r--datatrak.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/datatrak.h b/datatrak.h
index a86a6af0a..4e3ccd1a4 100644
--- a/datatrak.h
+++ b/datatrak.h
@@ -28,7 +28,7 @@ typedef struct dtrakheader_ {
#define read_string(_property) \
_property = (unsigned char *)calloc(tmp_1byte + 1, 1); \
- fread(_property, 1, tmp_1byte, archivo); \
- _property = strcat(to_utf8(_property), "");
+ fread((char *)_property, 1, tmp_1byte, archivo); \
+ _property = (unsigned char *)strcat(to_utf8(_property), "");
#endif // DATATRAK_HEADER_H