summaryrefslogtreecommitdiff
path: root/src/fruits/cmv
diff options
context:
space:
mode:
Diffstat (limited to 'src/fruits/cmv')
-rw-r--r--src/fruits/cmv/cmv.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/fruits/cmv/cmv.c b/src/fruits/cmv/cmv.c
index 02beffb..55d7d55 100644
--- a/src/fruits/cmv/cmv.c
+++ b/src/fruits/cmv/cmv.c
@@ -14,7 +14,7 @@
#ifndef CAMU_SINK_ONLY
#ifndef _WIN32
-static str *CMV_UNIX_PATH = al_str_c("/tmp/cmv_sock");
+static str CMV_UNIX_PATH = al_str_c("/tmp/cmv_sock");
#endif
#endif
@@ -93,9 +93,9 @@ s32 wmain(s32 argc, wchar_t **argv)
bool local = argc > 1;
if (local) {
#ifndef _WIN32
- type = NNWT_SOCKET_UNIX; addr = CMV_UNIX_PATH;
+ type = NNWT_SOCKET_UNIX; addr = &CMV_UNIX_PATH;
#else
- type = NNWT_SOCKET_TCP; addr = CAMU_LOCALHOST;
+ type = NNWT_SOCKET_TCP; addr = &CAMU_LOCALHOST;
#endif
camu_server_init(&c.server, &c.loop);
c.server.meta_callback = server_meta_callback;
@@ -109,7 +109,7 @@ s32 wmain(s32 argc, wchar_t **argv)
#endif
} else {
type = CAMU_TEST_TYPE;
- addr = CAMU_TEST_ADDR;
+ addr = &CAMU_TEST_ADDR;
}
#else
type = NNWT_SOCKET_TCP; addr = CAMU_TEST_ADDR;
@@ -129,10 +129,10 @@ s32 wmain(s32 argc, wchar_t **argv)
if (local) {
for (s32 i = 1; i < argc; i++) {
#ifndef _WIN32
- str arg = *al_str_cr(argv[i]);
+ str arg = al_str_cr(argv[i]);
#else
str arg;
- if (!al_wstr_to_str(al_wstr_cr(argv[i]), &arg)) {
+ if (!al_wstr_to_str(&al_wstr_cr(argv[i]), &arg)) {
al_log_error("cmv", "Failed to parse argument #%i.", i);
continue;
}
@@ -146,7 +146,7 @@ s32 wmain(s32 argc, wchar_t **argv)
nn_packet_write_u8(packet, CAMU_RESOURCE_HTTP);
#endif
#if CACHE_HAVE_CDIO
- } else if (al_str_cmp(&arg, al_str_c("cdda://"), 0, 7) == 0) {
+ } else if (al_str_cmp(&arg, &al_str_c("cdda://"), 0, 7) == 0) {
nn_packet_write_u8(packet, CAMU_RESOURCE_CDIO);
#endif
} else {