Skip to content

Commit 256adc5

Browse files
authored
Merge pull request #3828 from smoe/do_not_ignore_init_prob
fix emc/motion-logger: did not respect possible init failure
2 parents 70b2acd + 80ce03c commit 256adc5

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

src/emc/motion-logger/motion-logger.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ void log_print(const char *fmt, ...) {
249249
logfile = fopen(logfile_name, "w");
250250
if (logfile == NULL) {
251251
fprintf(stderr, "error opening %s: %s\n", logfile_name, strerror(errno));
252-
exit(1);
252+
exit(EXIT_FAILURE);
253253
}
254254
}
255255
}
@@ -270,18 +270,23 @@ int main(int argc, char* argv[]) {
270270
logfile_name = argv[1];
271271
} else {
272272
fprintf(stderr, "usage: motion-logger [LOGFILE]\n");
273-
exit(1);
273+
exit(EXIT_FAILURE);
274274
}
275275

276276
mot_comp_id = hal_init("motion-logger");
277277
motion_logger_data = hal_malloc(sizeof(*motion_logger_data));
278278
int r = hal_pin_bit_new("motion-logger.reopen-log", HAL_IO, &motion_logger_data->reopen,
279279
mot_comp_id);
280-
if(r < 0) { errno = -r; perror("hal_pin_bit_new"); exit(1); }
280+
if(r < 0) { errno = -r; perror("hal_pin_bit_new"); exit(EXIT_FAILURE); }
281281
*motion_logger_data->reopen = 0;
282282
r = hal_ready(mot_comp_id);
283-
if(r < 0) { errno = -r; perror("hal_ready"); exit(1); }
284-
init_comm_buffers();
283+
if(r < 0) { errno = -r; perror("hal_ready"); exit(EXIT_FAILURE); }
284+
285+
r = init_comm_buffers();
286+
if (r) {
287+
fprintf(stderr,"init_comm_buffer init failure\n");
288+
exit(EXIT_FAILURE);
289+
}
285290

286291
while (1) {
287292
rtapi_mutex_get(&emcmotStruct->command_mutex);

0 commit comments

Comments
 (0)