Imported Upstream version 3.3.0

[debian/amanda] / device-src / s3.h

diff --git a/device-src/s3.h b/device-src/s3.h
index 1e883a8c4465f01d37c0de9716970f2a67d51a71..c5ec6075378224188f45e4cfbcbabc2af0870ce8 100644 (file)
--- a/device-src/s3.h
+++ b/device-src/s3.h
@@ -153,6 +153,7 @@ typedef curl_progress_callback s3_progress_func;
     S3_ERROR(MissingSecurityHeader), \
     S3_ERROR(NoLoggingStatusForKey), \
     S3_ERROR(NoSuchBucket), \
+    S3_ERROR(NoSuchEntity), \
     S3_ERROR(NoSuchKey), \
     S3_ERROR(NotImplemented), \
     S3_ERROR(NotSignedUp), \
@@ -232,7 +233,9 @@ s3_init(void);
  * @returns: the new S3Handle
  */
 S3Handle *
-s3_open(const char * access_key, const char *secret_key, const char * user_token,
+s3_open(const char * access_key, const char *secret_key, const char *host,
+        const char *service_path, gboolean use_subdomain,
+        const char * user_token,
         const char * bucket_location, const char * storage_class, const char * ca_info);
 
 /* Deallocate an S3Handle
@@ -365,6 +368,7 @@ s3_upload(S3Handle *hdl,
  * @param prefix: the prefix
  * @param delimiter: delimiter (any length string)
  * @param list: (output) the list of files
+ * @param total_size: (output) sum of size of files 
  * @returns: FALSE if an error occurs
  */
 gboolean
@@ -372,7 +376,8 @@ s3_list_keys(S3Handle *hdl,
               const char *bucket,
               const char *prefix,
               const char *delimiter,
-              GSList **list);
+              GSList **list,
+              guint64 *total_size);
 
 /* Read an entire file, passing the contents to write_func buffer
  * by buffer.