Mercurial > hg > dav / file diff

--- a/dav/assistant.c	Sun Apr 16 14:12:24 2023 +0200
+++ b/dav/assistant.c	Fri Apr 21 21:25:32 2023 +0200
@@ -28,16 +28,17 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
-#include <ucx/string.h>
-#include <ucx/utils.h>
+#include <cx/string.h>
+#include <cx/utils.h>
 
 #include <libidav/utils.h>
 
 #include "assistant.h"
 
-char* assistant_getcfg(char *cfgname) {
-    sstr_t line;
+char* assistant_getcfg(const char *cfgname) {
+    cxmutstr line;
     char *value = NULL;
     while(!value) {
         printf("%s: ", cfgname);
@@ -54,8 +55,8 @@
     return value;
 }
 
-char* assistant_getoptcfg(char *cfgname) {
-    sstr_t line;
+char* assistant_getoptcfg(const char *cfgname) {
+    cxmutstr line;
     char *value = NULL;
     while(!value) {
         printf("%s (optional): ", cfgname);
@@ -74,7 +75,7 @@
     return value;
 }
 
-char* assistant_gethiddenoptcfg(char *cfgname) {
+char* assistant_gethiddenoptcfg(const char *cfgname) {
     printf("%s (optional): ", cfgname);
     fflush(stdout);
     char *pw = util_password_input("");
@@ -86,8 +87,8 @@
 }
 
 
-char* assistant_getdefcfg(char *cfgname, char *defval) {
-    sstr_t line;
+char* assistant_getdefcfg(const char *cfgname, const char *defval) {
+    cxmutstr line;
     char *value = NULL;
     while(!value) {
         printf("%s (default: %s): ", cfgname, defval);