Mercurial > hg > dav / file diff

--- a/dav/main.c	Fri Feb 12 18:26:58 2016 +0100
+++ b/dav/main.c	Fri Feb 26 20:54:42 2016 +0100
@@ -42,6 +42,7 @@
 #include <libidav/crypto.h>
 #include <libidav/session.h>
 #include "config.h"
+#include "error.h"
 #include "main.h"
 
 static DavContext *ctx;
@@ -266,70 +267,6 @@
     return repo;
 }
 
-void print_resource_error(DavSession *sn, char *path) {
-    char *res_url = util_concat_path(sn->base_url, path);
-    switch(sn->error) {
-        default: {
-            fprintf(stderr, "Operation failed for resource %s.\n", res_url);
-            if(sn->errorstr) {
-                fprintf(stderr, "%s\n", sn->errorstr);
-            }
-            break;
-        }
-        case DAV_NOT_FOUND: {
-            fprintf(stderr, "Resource %s not found.\n", res_url);
-            break;
-        }
-        case DAV_UNAUTHORIZED: {
-            fprintf(stderr, "Authentication required.\n");
-            break;
-        }
-        case DAV_FORBIDDEN: {
-            fprintf(stderr, "Access forbidden.\n");
-            break;
-        }
-        case DAV_METHOD_NOT_ALLOWED: {
-            fprintf(stderr, "Method not allowed.\n");
-        }
-        case DAV_CONFLICT: {
-            fprintf(
-                    stderr,
-                    "Missing intermediate collections for resource %s.\n",
-                    res_url);
-        }
-        case DAV_UNSUPPORTED_PROTOCOL: {
-            fprintf(stderr, "Unsupported protocol.\n");
-            if(sn->errorstr) {
-                fprintf(stderr, "%s\n", sn->errorstr);
-            }
-            break;
-        }
-        case DAV_COULDNT_RESOLVE_PROXY: {
-            fprintf(stderr, "Cannot resolve proxy host.\n");
-            break;
-        }
-        case DAV_COULDNT_RESOLVE_HOST: {
-            fprintf(stderr, "Cannot resolve host name.\n");
-            break;
-        }
-        case DAV_COULDNT_CONNECT: {
-            fprintf(stderr, "Cannot connect to host.\n");
-            break;
-        }
-        case DAV_TIMEOUT: {
-            fprintf(stderr, "Operation timed out.\n");
-            break;
-        }
-        case DAV_SSL_ERROR: {
-            fprintf(stderr, "SSL error.\n");
-            if(sn->errorstr) {
-                fprintf(stderr, "%s\n", sn->errorstr);
-            }
-        }
-    }
-    free(res_url);
-}
-
 int set_session_config(DavSession *sn, CmdArgs *a) {
     char *plain = cmd_getoption(a, "plain");
     char *crypt = cmd_getoption(a, "crypt");