From ee2a290abf16f4fd4736c2f4e17e9cff87f50447 Mon Sep 17 00:00:00 2001
From: Jan Willamowius <jan@willamowius.de>
Date: 周一, 22 4月 2019 01:58:13 +0800
Subject: [PATCH] fix gcc 5.4 warnings
---
src/library/base/logger.c | 2 +-
src/library/os/os.h | 4 ++++
src/library/base/logger.h | 2 +-
src/library/pc-identifiers.c | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/library/base/logger.c b/src/library/base/logger.c
index 1e4e662..089fc85 100644
--- a/src/library/base/logger.c
+++ b/src/library/base/logger.c
@@ -41,7 +41,7 @@
#endif
}
-void _log(char* format, ...) {
+void _log(const char* format, ...) {
char logpath[MAX_PATH];
va_list args;
char * buffer;
diff --git a/src/library/base/logger.h b/src/library/base/logger.h
index cf08405..0803685 100644
--- a/src/library/base/logger.h
+++ b/src/library/base/logger.h
@@ -25,7 +25,7 @@
#define LOG_ERROR(M, ...)
#endif
-void _log(char* format, ...);
+void _log(const char* format, ...);
void _shutdown_log();
#ifdef __cplusplus
diff --git a/src/library/os/os.h b/src/library/os/os.h
index bd19f9d..d953d1a 100644
--- a/src/library/os/os.h
+++ b/src/library/os/os.h
@@ -14,6 +14,10 @@
#include "../base/base.h"
#include <stddef.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <unistd.h>
//definition of size_t
#include <stdlib.h>
#ifdef __unix__
diff --git a/src/library/pc-identifiers.c b/src/library/pc-identifiers.c
index 2a57eaa..8353f55 100644
--- a/src/library/pc-identifiers.c
+++ b/src/library/pc-identifiers.c
@@ -179,7 +179,7 @@
if (use_label) {
if (diskInfos[i].label[0] != 0) {
memset(identifiers[j], 0, sizeof(PcIdentifier)); //!!!!!!!
- strncpy(identifiers[j], diskInfos[i].label,
+ strncpy((char*)identifiers[j], diskInfos[i].label,
sizeof(PcIdentifier));
j++;
}
--
Gitblit v1.9.1