repositories
/
deb_shairplay.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove some redundant code from shairplay CLI
[deb_shairplay.git]
/
src
/
shairplay.c
diff --git
a/src/shairplay.c
b/src/shairplay.c
index 691b24f36f59941117552478dc571c521994970a..9bb9537fd75bdafaee512b0fefa1705815356fbf 100644
(file)
--- a/
src/shairplay.c
+++ b/
src/shairplay.c
@@
-226,7
+226,8
@@
parse_options(shairplay_options_t *opt, int argc, char *argv[])
char *path = argv[0];
char *arg;
char *path = argv[0];
char *arg;
- strcpy(opt->apname, "Shairplay");
+ /* Set default values for apname and port */
+ strncpy(opt->apname, "Shairplay", sizeof(opt->apname)-1);
opt->port = 5000;
while ((arg = *++argv)) {
opt->port = 5000;
while ((arg = *++argv)) {
@@
-264,13
+265,6
@@
parse_options(shairplay_options_t *opt, int argc, char *argv[])
}
}
}
}
- /* Set default values for apname and port */
- if (!strlen(opt->apname)) {
- strncpy(opt->apname, "Shairplay", sizeof(opt->apname)-1);
- }
- if (!opt->port) {
- opt->port = 5000;
- }
return 0;
}
return 0;
}
@@
-285,6
+279,7
@@
main(int argc, char *argv[])
dnssd_t *dnssd;
raop_t *raop;
raop_callbacks_t raop_cbs;
dnssd_t *dnssd;
raop_t *raop;
raop_callbacks_t raop_cbs;
+ char *password = NULL;
int error;
int error;
@@
-322,8
+317,11
@@
main(int argc, char *argv[])
return -1;
}
return -1;
}
+ if (strlen(options.password)) {
+ password = options.password;
+ }
raop_set_log_level(raop, RAOP_LOG_DEBUG);
raop_set_log_level(raop, RAOP_LOG_DEBUG);
- raop_start(raop, &options.port, hwaddr, sizeof(hwaddr),
NULL
);
+ raop_start(raop, &options.port, hwaddr, sizeof(hwaddr),
password
);
error = 0;
dnssd = dnssd_init(&error);
error = 0;
dnssd = dnssd_init(&error);