diff --git a/CHANGELOG.md b/CHANGELOG.md index 1631555770e..719f48e7165 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https: ## [Unreleased] +### Changed + ### Removed - remove no longer used pkglists [PR #1335] @@ -12,7 +14,11 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https: - cats: fix issue where `startfile` field gets wrongly updated [PR #1346] - Python Plugins: Avoid pop(0) performance impact [PR #1351] +### Fixed +- Fix gcc warnings in ndmjob program [PR #1343] + [PR #1335]: https://github.com/bareos/bareos/pull/1335 +[PR #1343]: https://github.com/bareos/bareos/pull/1343 [PR #1346]: https://github.com/bareos/bareos/pull/1346 [PR #1351]: https://github.com/bareos/bareos/pull/1351 [unreleased]: https://github.com/bareos/bareos/tree/master diff --git a/core/src/ndmp/ndmjob_args.c b/core/src/ndmp/ndmjob_args.c index d544a3b7310..79f7498a5b6 100644 --- a/core/src/ndmp/ndmjob_args.c +++ b/core/src/ndmp/ndmjob_args.c @@ -825,6 +825,7 @@ void dump_settings(void) int copy_args_expanding_macros(int argc, char* argv[], char* av[], int max_ac) { + (void) max_ac; //unused int i, ac = 0, rc; char* arg; char* p; diff --git a/core/src/ndmp/ndmjob_main_util.c b/core/src/ndmp/ndmjob_main_util.c index cacba4bfda4..92397ec5a5f 100644 --- a/core/src/ndmp/ndmjob_main_util.c +++ b/core/src/ndmp/ndmjob_main_util.c @@ -96,6 +96,7 @@ void error_byebye(char* fmt, ...) void ndmjob_log_deliver(struct ndmlog* log, char* tag, int lev, char* msg) { + (void) log; //unused char tagbuf[32]; if (the_mode == 'D') { @@ -125,6 +126,8 @@ void ndmjob_log_deliver(struct ndmlog* log, char* tag, int lev, char* msg) #ifndef NDMOS_OPTION_NO_CONTROL_AGENT void ndmjob_ixlog_deliver(struct ndmlog* log, char* tag, int lev, char* msg) { + (void) log; //unused + (void) lev; //unused fprintf(index_fp, "%s %s\n", tag, msg); fflush(index_fp); /* this doesn't change the run time */ } diff --git a/core/src/ndmp/ndmjob_simulator.c b/core/src/ndmp/ndmjob_simulator.c index a0714ab37a1..ddb1645477d 100644 --- a/core/src/ndmp/ndmjob_simulator.c +++ b/core/src/ndmp/ndmjob_simulator.c @@ -957,7 +957,7 @@ static void robot_state_load(struct ndm_session* sess, struct robot_state* rs) robot_state_init(rs); return; } - if (read(fd, (void*)rs, sizeof(*rs)) < sizeof(*rs)) { + if (read(fd, (void*)rs, (sizeof(*rs)) < sizeof(*rs))) { robot_state_init(rs); close(fd); return; @@ -977,7 +977,7 @@ static int robot_state_save(struct ndm_session* sess, struct robot_state* rs) snprintf(filename, sizeof filename, "%s/state", sess->robot_acb->sim_dir); fd = open(filename, O_WRONLY | O_TRUNC | O_CREAT, 0666); if (fd < 0) return -1; - if (write(fd, (void*)rs, sizeof(*rs)) < sizeof(*rs)) { + if (write(fd, (void*)rs, (sizeof(*rs)) < sizeof(*rs))) { close(fd); return -1; } @@ -1464,11 +1464,13 @@ static ndmp9_error ndmjob_scsi_open(struct ndm_session* sess, char* name) static ndmp9_error ndmjob_scsi_close(struct ndm_session* sess) { + (void) sess; //unused return NDMP9_NO_ERR; } static ndmp9_error ndmjob_scsi_reset(struct ndm_session* sess) { + (void) sess; //unused return NDMP9_NO_ERR; } @@ -1493,10 +1495,11 @@ static int ndmjob_validate_password(struct ndm_session* sess, char* name, char* pass) { - if (strcmp(name, "ndmp") != 0) return 0; - - if (strcmp(pass, "ndmp") != 0) return 0; - + (void) sess; //unused + if (strcmp(name, "ndmp") != 0) + return 0; + if (strcmp(pass, "ndmp") != 0) + return 0; return 1; /* OK */ } diff --git a/core/src/ndmp/ndmjr_none.c b/core/src/ndmp/ndmjr_none.c index 65ad39b40a8..4fa773debf1 100644 --- a/core/src/ndmp/ndmjr_none.c +++ b/core/src/ndmp/ndmjr_none.c @@ -43,6 +43,10 @@ #include "ndmjr_none.h" -int ndmjr_none_apply(struct ndm_job_param* job, char* reason) { return 0; } +int ndmjr_none_apply(struct ndm_job_param* job, char* reason) { + (void) job; //unused + (void) reason; //unused + return 0; +} #endif /* !NDMOS_OPTION_NO_CONTROL_AGENT */