Skip to content

F
FMC DEL 1ns 4cha
Commit 2a478a2d authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

tools: always use fdelay_strerror to print err strings 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent ede2d0c5
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 17 deletions
software/tools/fmc-fdelay-board-time.c
View file @ 2a478a2d
......@@ -92,14 +92,14 @@ int main(int argc, char **argv)
b = fdelay_open(dev);
if (!b) {
fprintf(stderr, "%s: fdelay_open(): %s\n", argv[0],
strerror(errno));
fdelay_strerror(errno));
exit(1);
}
if (get) {
if (fdelay_get_time(b, &t) < 0) {
fprintf(stderr, "%s: fdelay_get_time(): %s\n", argv[0],
strerror(errno));
fdelay_strerror(errno));
exit(1);
}
......@@ -111,7 +111,7 @@ int main(int argc, char **argv)
case ENOLINK: printf("link down.\n"); break;
case EAGAIN: printf("synchronization in progress.\n"); break;
case 0: printf("synchronized.\n"); break;
default: printf("error: %s\n", strerror(errno)); break;
default: printf("error: %s\n", fdelay_strerror(errno)); break;
}
printf("Time: %lli.%09li\n", (long long)t.utc, (long)t.coarse * 8);
......@@ -123,7 +123,7 @@ int main(int argc, char **argv)
if (host) {
if (fdelay_set_host_time(b) < 0) {
fprintf(stderr, "%s: fdelay_set_host_time(): %s\n",
argv[0], strerror(errno));
argv[0], fdelay_strerror(errno));
exit(1);
}
fdelay_close(b);
......@@ -144,7 +144,7 @@ int main(int argc, char **argv)
exit(1);
} else if (err) {
fprintf(stderr, "%s: fdelay_wr_mode(): %s\n",
argv[0], strerror(errno));
argv[0], fdelay_strerror(errno));
exit(1);
}
......@@ -168,7 +168,7 @@ int main(int argc, char **argv)
if (wr_off) {
if (fdelay_wr_mode(b, 0) < 0) {
fprintf(stderr, "%s: fdelay_wr_mode(): %s\n",
argv[0], strerror(errno));
argv[0], fdelay_strerror(errno));
exit(1);
}
......@@ -179,7 +179,7 @@ int main(int argc, char **argv)
if (fdelay_set_time(b, &t) < 0) {
fprintf(stderr, "%s: fdelay_set_time(): %s\n",
argv[0], strerror(errno));
argv[0], fdelay_strerror(errno));
exit(1);
}
fdelay_close(b);
......
software/tools/fmc-fdelay-input.c
View file @ 2a478a2d
......@@ -115,7 +115,7 @@ int input_timestamp(struct fdelay_board *b, int count, int umode, int nonblock)
if (ret < 0) {
err = ret;
fprintf(stderr, "%s: fdelay_read: %s\n", prog,
strerror(errno));
fdelay_strerror(errno));
break;
}
if (!ret)
......@@ -237,7 +237,7 @@ int main(int argc, char **argv)
b = fdelay_open(dev);
if (!b) {
fprintf(stderr, "%s: fdelay_open(): %s\n", argv[0],
strerror(errno));
fdelay_strerror(errno));
exit(1);
}
......
software/tools/fmc-fdelay-pulse.c
View file @ 2a478a2d
......@@ -351,7 +351,7 @@ int main(int argc, char **argv)
b = fdelay_open(dev);
if (!b) {
fprintf(stderr, "%s: fdelay_open(): %s\n", argv[0],
strerror(errno));
fdelay_strerror(errno));
exit(1);
}
......@@ -414,9 +414,10 @@ int main(int argc, char **argv)
goto out;
}
if ((err = fdelay_config_pulse(b, channel, &p)) < 0) {
err = fdelay_config_pulse(b, channel, &p);
if (err) {
fprintf(stderr, "%s: fdelay_config_pulse(): %s\n",
argv[0], strerror(-err));
argv[0], fdelay_strerror(errno));
exit(1);
}
while (trigger_wait) {
......@@ -429,7 +430,7 @@ int main(int argc, char **argv)
i = fdelay_has_triggered(b, channel);
if (i < 0) {
fprintf(stderr, "%s: waiting for trigger: %s\n",
argv[0], strerror(errno));
argv[0], fdelay_strerror(errno));
exit(1);
}
trigger_wait = !i;
......
software/tools/fmc-fdelay-status.c
View file @ 2a478a2d
......@@ -94,7 +94,7 @@ int main(int argc, char **argv)
b = fdelay_open(dev);
if (!b) {
fprintf(stderr, "%s: fdelay_open(): %s\n", argv[0],
strerror(errno));
fdelay_strerror(errno));
exit(1);
}
......@@ -112,7 +112,7 @@ int main(int argc, char **argv)
if (fdelay_get_config_pulse(b, FDELAY_OUTPUT_USER_TO_HW(ch),
&p) < 0) {
fprintf(stderr, "%s: get_config(channel %i): %s\n",
argv[0], ch, strerror(errno));
argv[0], ch, fdelay_strerror(errno));
}
/* pass hw number again, as the function is low-level */
report_output_config(FDELAY_OUTPUT_USER_TO_HW(ch),
......
software/tools/fmc-fdelay-term.c
View file @ 2a478a2d
......@@ -66,7 +66,7 @@ int main(int argc, char **argv)
b = fdelay_open(dev);
if (!b) {
fprintf(stderr, "%s: fdelay_open(): %s\n", argv[0],
strerror(errno));
fdelay_strerror(errno));
exit(1);
}
......@@ -85,7 +85,7 @@ int main(int argc, char **argv)
if (err)
{
fprintf(stderr, "%s: error setting termination: %s", argv[0], strerror(errno));
fprintf(stderr, "%s: error setting termination: %s", argv[0], fdelay_strerror(errno));
exit(1);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment