diff options
| author | Lars-Dominik Braun <lars@6xq.net> | 2016-02-11 19:50:55 +0100 |
|---|---|---|
| committer | Lars-Dominik Braun <lars@6xq.net> | 2016-02-11 19:53:55 +0100 |
| commit | bdc9dc727b0464bc17bed002d2a701cfc34b777a (patch) | |
| tree | d6c597c119b94e1c8641224a754c970a85788f0d | |
| parent | 7235a62c183d3815a0fc3dd7e05c6a3492a23f1f (diff) | |
| download | pianobar-bdc9dc727b0464bc17bed002d2a701cfc34b777a.tar.gz pianobar-bdc9dc727b0464bc17bed002d2a701cfc34b777a.tar.bz2 pianobar-bdc9dc727b0464bc17bed002d2a701cfc34b777a.zip | |
Add default value for rpcTlsPort
Passing NULL to printf and the result to curl may or may not work. YMMV.
Fixes #574.
| -rw-r--r-- | src/settings.c | 2 | ||||
| -rw-r--r-- | src/ui.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/settings.c b/src/settings.c index f98874c..f1aa707 100644 --- a/src/settings.c +++ b/src/settings.c @@ -168,7 +168,7 @@ void BarSettingsRead (BarSettings_t *settings) { settings->npStationFormat = strdup ("Station \"%n\" (%i)"); settings->listSongFormat = strdup ("%i) %a - %t%r"); settings->rpcHost = strdup (PIANO_RPC_HOST); - settings->rpcTlsPort = NULL; + settings->rpcTlsPort = strdup ("443"); settings->partnerUser = strdup ("android"); settings->partnerPassword = strdup ("AC7IBG09A3DTSYM4R41UJWL07VLN8JI7"); settings->device = strdup ("android-generic"); @@ -178,7 +178,11 @@ static CURLcode BarPianoHttpRequest (CURL * const http, const BarSettings_t * const settings, PianoRequest_t * const req) { buffer buffer = {NULL, 0}; sig_atomic_t lint = 0, *prevint; + char url[2048]; + assert (settings->rpcHost != NULL); + assert (settings->rpcTlsPort != NULL); + assert (req->urlPath != NULL); int ret = snprintf (url, sizeof (url), "%s://%s:%s%s", req->secure ? "https" : "http", settings->rpcHost, |