Mercurial > hg > dav / file diff

--- a/libidav/davqlexec.h	Sun Apr 16 14:12:24 2023 +0200
+++ b/libidav/davqlexec.h	Fri Apr 21 21:25:32 2023 +0200
@@ -32,7 +32,7 @@
 #include "davqlparser.h"
 #include "webdav.h"
 
-#include <ucx/buffer.h>
+#include <cx/buffer.h>
 
 #ifdef	__cplusplus
 extern "C" {
@@ -66,7 +66,8 @@
 typedef enum {
     DAVQL_OK = 0,
     DAVQL_UNSUPPORTED_FORMATCHAR,
-    DAVQL_UNKNOWN_FORMATCHAR
+    DAVQL_UNKNOWN_FORMATCHAR,
+    DAVQL_OOM
 } davqlerror_t;
 
 typedef enum {
@@ -116,7 +117,7 @@
     davqlcmdtype_t type;
     union DavQLCmdData {
         int64_t        integer;
-        sstr_t         string;
+        cxmutstr       string;
         time_t         timestamp;
         davqlresprop_t resprop;
         DavPropName    property;
@@ -142,14 +143,14 @@
 typedef struct DavCompiledField {
     char *ns;
     char *name;
-    UcxBuffer *code;
+    CxBuffer *code;
 } DavCompiledField;
 
 typedef struct DavOrderCriterion {
     int type; // 0: resprop, 1: property
     union DavQLColumn {
         davqlresprop_t resprop;
-        UcxKey property;
+        CxHashKey property;
     } column;
     _Bool descending;
 } DavOrderCriterion;
@@ -165,16 +166,16 @@
 DavResult dav_statement_exec(DavSession *sn, DavQLStatement *st, ...);
 DavResult dav_statement_execv(DavSession *sn, DavQLStatement *st, va_list ap);
 
-UcxBuffer* dav_path_string(sstr_t src, DavQLArgList *args, davqlerror_t *error);
-sstr_t dav_format_string(UcxAllocator *a, sstr_t fstr, DavQLArgList *ap, davqlerror_t *error);
+CxBuffer* dav_path_string(cxmutstr src, DavQLArgList *args, davqlerror_t *error);
+cxmutstr dav_format_string(const CxAllocator *a, cxstring fstr, DavQLArgList *ap, davqlerror_t *error);
 
 DavResult dav_exec_select(DavSession *sn, DavQLStatement *st, va_list ap);
 
-int dav_identifier2resprop(sstr_t src, davqlresprop_t *prop);
+int dav_identifier2resprop(cxstring src, davqlresprop_t *prop);
 
-UcxBuffer* dav_compile_expr(DavContext *ctx, UcxAllocator *a, DavQLExpression *lexpr, DavQLArgList *ap);
+CxBuffer* dav_compile_expr(DavContext *ctx, const CxAllocator *a, DavQLExpression *lexpr, DavQLArgList *ap);
 
-int dav_exec_expr(UcxBuffer *bcode, DavResource *res, DavQLStackObj *result);
+int dav_exec_expr(CxBuffer *bcode, DavResource *res, DavQLStackObj *result);