home
/
code
/
khatus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dd2bdef
)
Break out option parsing into a function
author
Siraaj Khandkar
<siraaj@khandkar.net>
Sun, 22 Mar 2020 04:07:06 +0000
(
00:07
-0400)
committer
Siraaj Khandkar
<siraaj@khandkar.net>
Sun, 22 Mar 2020 04:07:06 +0000
(
00:07
-0400)
x5/khatus_sensor_time.c
patch
|
blob
|
blame
|
history
diff --git
a/x5/khatus_sensor_time.c
b/x5/khatus_sensor_time.c
index
983ebdf
..
ad170ef
100644
(file)
--- a/
x5/khatus_sensor_time.c
+++ b/
x5/khatus_sensor_time.c
@@
-17,7
+17,11
@@
#define MAX_LEN 20
#define END_OF_MESSAGE '\n'
#define MAX_LEN 20
#define END_OF_MESSAGE '\n'
-char *argv0;
+char *argv0 = NULL;
+
+double opt_interval = 1.0;
+char *opt_fmt = "%a %b %d %H:%M:%S";
+char *fifo_name = NULL;
void
print_usage()
void
print_usage()
@@
-32,29
+36,11
@@
print_usage()
argv0);
}
argv0);
}
-int
-
main
(int argc, char **argv)
+void
+
opt_parse
(int argc, char **argv)
{
{
- argv0 = argv[0];
-
- double opt_interval = 1.0;
- char *opt_fmt = "%a %b %d %H:%M:%S";
-
- time_t t;
- struct timespec ti;
- char buf[MAX_LEN];
char c;
char c;
- char *fifo_name;
- int fifo_fd = -1;
-
- int n = 0; /* written */
- int r = 0; /* remaining */
- int i = 0; /* buffer position */
-
- signal(SIGPIPE, SIG_IGN); /* Handling manually */
-
- memset(buf, '\0', MAX_LEN);
while ((c = getopt(argc, argv, "f:i:h")) != -1)
switch (c) {
case 'f':
while ((c = getopt(argc, argv, "f:i:h")) != -1)
switch (c) {
case 'f':
@@
-66,7
+52,7
@@
main(int argc, char **argv)
break;
case 'h':
print_usage();
break;
case 'h':
print_usage();
-
return 0
;
+
exit(EXIT_SUCCESS)
;
case '?':
if (optopt == 'f' || optopt == 'i')
fprintf(stderr,
case '?':
if (optopt == 'f' || optopt == 'i')
fprintf(stderr,
@@
-80,7
+66,7
@@
main(int argc, char **argv)
fprintf(stderr,
"Unknown option character `\\x%x'.\n",
optopt);
fprintf(stderr,
"Unknown option character `\\x%x'.\n",
optopt);
-
return 1
;
+
exit(EXIT_FAILURE)
;
default:
assert(0);
}
default:
assert(0);
}
@@
-88,33
+74,55
@@
main(int argc, char **argv)
debug("fifo_name: %s\n", fifo_name);
if (!fifo_name)
usage("No filename was provided\n");
debug("fifo_name: %s\n", fifo_name);
if (!fifo_name)
usage("No filename was provided\n");
+}
+
+int
+main(int argc, char **argv)
+{
+ argv0 = argv[0];
+
+ time_t t;
+ struct timespec ti;
+ char buf[MAX_LEN];
+
+ int fd = -1;
+
+ int n = 0; /* written */
+ int r = 0; /* remaining */
+ int i = 0; /* buffer position */
+
+ opt_parse(argc, argv);
+
+ signal(SIGPIPE, SIG_IGN); /* Handling manually */
+
+ memset(buf, '\0', MAX_LEN);
ti = timespec_of_float(opt_interval);
for (;;) {
debug("openning \"%s\"\n", fifo_name);
ti = timespec_of_float(opt_interval);
for (;;) {
debug("openning \"%s\"\n", fifo_name);
- f
ifo_f
d = open(fifo_name, O_WRONLY);
- if (f
ifo_f
d < 0)
+ fd = open(fifo_name, O_WRONLY);
+ if (fd < 0)
fatal("Failed to open FIFO file: \"%s\". Error: %s\n",
fifo_name,
strerror(errno));
fatal("Failed to open FIFO file: \"%s\". Error: %s\n",
fifo_name,
strerror(errno));
- debug("openned. fd: %d\n", f
ifo_f
d);
+ debug("openned. fd: %d\n", fd);
t = time(NULL);
strftime(buf, MAX_LEN, opt_fmt, localtime(&t));
r = strlen(buf);
buf[r] = END_OF_MESSAGE;
t = time(NULL);
strftime(buf, MAX_LEN, opt_fmt, localtime(&t));
r = strlen(buf);
buf[r] = END_OF_MESSAGE;
- for (i = 0; (n = write(f
ifo_f
d, buf + i++, 1)) && r; r--)
+ for (i = 0; (n = write(fd, buf + i++, 1)) && r; r--)
;
if (n < 0)
fatal("Failed to write to %s. Err num: %d, Err msg: %s\n",
fifo_name,
errno,
strerror(errno));
;
if (n < 0)
fatal("Failed to write to %s. Err num: %d, Err msg: %s\n",
fifo_name,
errno,
strerror(errno));
- if (close(f
ifo_f
d) < 0)
+ if (close(fd) < 0)
fatal("Failed to close %s. Err num: %d, Err msg: %s\n",
fifo_name,
errno,
strerror(errno));
fatal("Failed to close %s. Err num: %d, Err msg: %s\n",
fifo_name,
errno,
strerror(errno));
- f
ifo_f
d = -1;
- debug("closed. fd: %d\n", f
ifo_f
d);
+ fd = -1;
+ debug("closed. fd: %d\n", fd);
snooze(&ti);
}
return EXIT_SUCCESS;
snooze(&ti);
}
return EXIT_SUCCESS;
This page took
0.040836 seconds
and
4
git commands to generate.