diff -r 938957a4eea7 -r 9a5a7a513a96 dav/davql.c --- a/dav/davql.c Thu Aug 22 12:45:12 2013 +0200 +++ b/dav/davql.c Thu Aug 22 14:09:26 2013 +0200 @@ -454,7 +454,7 @@ } int pos = stackpos-1; if(stack[pos].type == DAVQOP_INTEGER) { - printf("not %" PRId64 "\n", stack[pos].intval); + //printf("not %" PRId64 "\n", stack[pos].intval); stack[pos].intval = !stack[pos].intval; } else { // error @@ -490,9 +490,9 @@ case DAVQOP_INTEGER: case DAVQOP_TIME: { if(op.type == DAVQOP_STRING) { - printf("put on stack: '%s'\n", op.val); + //printf("put on stack: '%s'\n", op.val); } else { - printf("put on stack[%d]: %" PRId64 "\n", stackpos, op.intval); + //printf("put on stack[%d]: %" PRId64 "\n", stackpos, op.intval); } stack[stackpos++] = op; break; @@ -505,11 +505,11 @@ DavQOp value; value.type = DAVQOP_STRING; if(property_value) { - printf("put on stack: \"%s\"\n", property_value); + //printf("put on stack: \"%s\"\n", property_value); value.val = property_value; value.intval = strlen(property_value); } else { - printf("put on stack: null string\n"); + //printf("put on stack: null string\n"); value.val = NULL; value.intval = 0; } @@ -522,10 +522,10 @@ value.type = DAVQOP_INTEGER; value.val = NULL; if(!sstrcmp(name, S("contentlength"))) { - printf("put contentlength\n"); + //printf("put contentlength\n"); value.intval = res->contentlength; } else if(!sstrcmp(name, S("lastmodified"))) { - printf("put getlastmodified\n"); + //printf("put getlastmodified\n"); value.intval = res->lastmodified; } else if(!sstrcmp(name, S("creationdate"))) { value.intval = res->creationdate; @@ -551,7 +551,7 @@ return 0; } DavQOp result = stack[0]; - printf("result: %" PRId64 "\n", result.intval); + //printf("result: %" PRId64 "\n", result.intval); return (int)result.intval; } @@ -563,55 +563,55 @@ switch(op) { case 5: { // < - printf("compare: %" PRId64 " < %" PRId64 "\n", v1, v2); + //printf("compare: %" PRId64 " < %" PRId64 "\n", v1, v2); res.intval = v1 < v2; break; } case 6: { // > - printf("compare: %" PRId64 " > %" PRId64 "\n", v1, v2); + //printf("compare: %" PRId64 " > %" PRId64 "\n", v1, v2); res.intval = v1 > v2; break; } case 7: { // == - printf("compare: %" PRId64 " == %" PRId64 "\n", v1, v2); + //printf("compare: %" PRId64 " == %" PRId64 "\n", v1, v2); res.intval = v1 == v2; break; } case 8: { // != - printf("compare: %" PRId64 " != %" PRId64 "\n", v1, v2); + //printf("compare: %" PRId64 " != %" PRId64 "\n", v1, v2); res.intval = v1 != v2; break; } case 9: { // <= - printf("compare: %" PRId64 " <= %" PRId64 "\n", v1, v2); + //printf("compare: %" PRId64 " <= %" PRId64 "\n", v1, v2); res.intval = v1 <= v2; break; } case 10: { // >= - printf("compare: %" PRId64 " >= %" PRId64 "\n", v1, v2); + //printf("compare: %" PRId64 " >= %" PRId64 "\n", v1, v2); res.intval = v1 >= v2; break; } case 11: { // and - printf("compare: %" PRId64 " and %" PRId64 "\n", v1, v2); + //printf("compare: %" PRId64 " and %" PRId64 "\n", v1, v2); res.intval = v1 && v2; break; } case 12: { // or - printf("compare: %" PRId64 " or %" PRId64 "\n", v1, v2); + //printf("compare: %" PRId64 " or %" PRId64 "\n", v1, v2); res.intval = v1 || v2; break; } case 13: { // xor - printf("compare: %" PRId64 " xor %" PRId64 "\n", v1, v2); + //printf("compare: %" PRId64 " xor %" PRId64 "\n", v1, v2); res.intval = v1 ^ v2; break; } @@ -637,55 +637,55 @@ switch(op) { case 5: { // < - printf("str compare: %.*s < %.*s\n", s1.length, s1.ptr, s2.length, s2.ptr); + //printf("str compare: %.*s < %.*s\n", s1.length, s1.ptr, s2.length, s2.ptr); res.intval = s1.length < s2.length; break; } case 6: { // > - printf("str compare: %.*s > %.*s\n", s1.length, s1.ptr, s2.length, s2.ptr); + //printf("str compare: %.*s > %.*s\n", s1.length, s1.ptr, s2.length, s2.ptr); res.intval = s1.length > s2.length; break; } case 7: { // == - printf("str compare: %.*s == %.*s\n", s1.length, s1.ptr, s2.length, s2.ptr); + //printf("str compare: %.*s == %.*s\n", s1.length, s1.ptr, s2.length, s2.ptr); res.intval = sstrcmp(s1, s2) == 0; break; } case 8: { // != - printf("str compare: %.*s != %.*s\n", s1.length, s1.ptr, s2.length, s2.ptr); + //printf("str compare: %.*s != %.*s\n", s1.length, s1.ptr, s2.length, s2.ptr); res.intval = sstrcmp(s1, s2) != 0; break; } case 9: { // <= - printf("str compare: %.*s <= %.*s\n", s1.length, s1.ptr, s2.length, s2.ptr); + //printf("str compare: %.*s <= %.*s\n", s1.length, s1.ptr, s2.length, s2.ptr); res.intval = s1.length <= s2.length; break; } case 10: { // >= - printf("str compare: %.*s >= %.*s\n", s1.length, s1.ptr, s2.length, s2.ptr); + //printf("str compare: %.*s >= %.*s\n", s1.length, s1.ptr, s2.length, s2.ptr); res.intval = s1.length >= s2.length; break; } case 11: { // and - printf("str compare: %.*s and %.*s\n", s1.length, s1.ptr, s2.length, s2.ptr); + //printf("str compare: %.*s and %.*s\n", s1.length, s1.ptr, s2.length, s2.ptr); res.intval = s1.ptr && s2.ptr; break; } case 12: { // or - printf("str compare: %.*s or %.*s\n", s1.length, s1.ptr, s2.length, s2.ptr); + //printf("str compare: %.*s or %.*s\n", s1.length, s1.ptr, s2.length, s2.ptr); res.intval = s1.ptr || s2.ptr; break; } case 13: { // xor - printf("str compare: %.*s xor %.*s\n", s1.length, s1.ptr, s2.length, s2.ptr); + //printf("str compare: %.*s xor %.*s\n", s1.length, s1.ptr, s2.length, s2.ptr); res.intval = (intptr_t)s1.ptr ^ (intptr_t)s2.ptr; break; }