dav: comparison dav/main.c

-:1f40ca07ae1b
+:839fefbdedc7
 return -1;
 }
 // get list of resources
 CxList *reslist = cxLinkedListCreateSimple(CX_STORE_POINTERS);
-reslist->simple_destructor = (cx_destructor_func)free_getres;
+cxDefineDestructor(reslist, free_getres);
 uint64_t totalsize = 0;
 uint64_t rescount = 0;
 GetResource *getres = malloc(sizeof(GetResource));
 getres->res = res;
 char *structure = cmd_getoption(a, "structure");
 // iterate over resource tree
 CxList *stack = cxLinkedListCreateSimple(CX_STORE_POINTERS);
 cxListInsert(stack, 0, getres);
-while(stack->size > 0) {
+while(cxListSize(stack) > 0) {
 GetResource *g = cxListAt(stack, 0);
 cxListRemove(stack, 0);
 if(g->res->iscollection) {
 DavResource *child = g->res->children;
 }
 tout = tar_open(tarfile);
 } else {
 get = get_resource;
 }
-CxIterator i = cxListIterator(reslist);
+CxIterator iter = cxListIterator(reslist);
-cx_foreach(GetResource *, getres, i) {
+cx_foreach(GetResource *, res_item, iter) {
-ret = get(repo, getres, a, tout);
+ret = get(repo, res_item, a, tout);
 if(ret) {
 break;
 }
 }
 if(export) {
 if(set_session_config(destsn, a)) {
 return -1;
 }
 DavResource *dest = dav_resource_new(destsn, destpath);
 char *desthref = dav_resource_get_href(dest);
-char *desturl = util_get_url(destsn, desthref);
+desturl = util_get_url(destsn, desthref);
 DavResource *res = dav_resource_new(srcsn, srcpath);
 int err = cp ? dav_copyto(res, desturl, override)
 : dav_moveto(res, desturl, override);
 if(!dav_load(res)) {
 printf("name: %s\n", res->name);
 printf("path: %s\n", res->path);
 char *server = util_url_base(sn->base_url);
-char *url = util_concat_path(server, res->href);
+url = util_concat_path(server, res->href);
 printf("url:  %s\n", url);
 free(url);
 free(server);
 if(res->iscollection) {
 printf("  %s: %.*s\n", p.name, (int)value.length, value.ptr);
 } else {
 // find some xml elements
 printf("  %s: ", p.name);
 DavXmlNode *x = xval->type == DAV_XML_ELEMENT ? xval : dav_xml_nextelm(xval);
-for(int i=0;i<3;i++) {
+for(int j=0;j<3;j++) {
 if(x) {
-if(i == 2) {
+if(j == 2) {
 printf(" ...");
 break;
 } else {
 print_xml_infostr(x);
 }
 break;
 }
 x = dav_xml_nextelm(x);
 }
 printf("\n");
 }
 }
 dav_session_free(sn, properties);
 return 0;
 return buf.space;
 }
 void printxmldoc(FILE *out, char *root, char *rootns, DavXmlNode *content) {
 CxMap *nsmap = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, 16);
-nsmap->simple_destructor = free;
+cxDefineDestructor(nsmap, free);
 cxMapPut(nsmap, cx_hash_key_str(rootns), "x0");
 fprintf(out, "%s", "<?xml version=\"1.0\"?>\n");
 fprintf(out, "<x0:%s xmlns:x0=\"%s\">", root, rootns);
 char *password = util_password_input("Password: ");
 // optionally, get one or more locations
 char *location = NULL;
 CxList *locations = cxLinkedListCreateSimple(CX_STORE_POINTERS);
-locations->simple_destructor = free;
+cxDefineDestructor(locations, free);
 while((location = assistant_getoptcfg("Location"))) {
 cxListAdd(locations, location);
 }
 int ret = 1;
 /*
 * called before the secret store is decrypted
 */
 static int cmd_ss_list_users_bc(CmdArgs *Args, PwdStore *secrets, int *ret) {
-if(secrets->index->size == 0) {
+if(cxMapSize(secrets->index) == 0) {
 return 1; // abort, because the secret store is empty
 }
 // set ret to 1, because decrypt could fail and this should be an error
 *ret = 1;
 return 0;
 *ret = 0;
 CxList *list = secrets->locations;
 for(int i=0;i<2;i++) {
 if(list) {
-CxIterator i = cxListIterator(list);
+CxIterator iter = cxListIterator(list);
-cx_foreach(PwdIndexEntry*, index, i) {
+cx_foreach(PwdIndexEntry*, index, iter) {
 PwdEntry *e = cxMapGet(secrets->ids, cx_hash_key_str(index->id));
 if(e) {
 printf("Id: %s\n", e->id);
 printf("User: %s\n", e->user);
 if(index->locations) {
 }
 }
 }
 static void secrets_remove_location(PwdIndexEntry *index) {
-if(!index->locations || index->locations->size == 0) {
+if(!index->locations || cxListSize(index->locations) == 0) {
 printf("no locations\n");
 return;
 }
 printf("0: abort\n");
 secrets_remove_location(index);
 break;
 }
 case 4: {
 // list locations
-if(!index->locations || index->locations->size == 0) {
+if(!index->locations || cxListSize(index->locations)) {
 printf("no locations\n");
 } else {
 CxIterator i = cxListIterator(index->locations);
 cx_foreach(char *, location, i) {
 printf("Location: %s\n", location);

Mercurial > hg > dav / file comparison

comparison: dav/main.c

dav/main.c