Ark/mediafire-fuse
1
0
Fork 0
mirror of https://github.com/xorgy/mediafire-fuse synced 2026-01-13 13:14:29 -08:00
Code Issues Packages Projects Releases Wiki Activity

move mfconn_update_secret_key into the apicalls

Browse Source
This commit is contained in:
josch
2014-12-05 14:02:33 +01:00
parent 7e26de7e2a
commit 73123d87e9
30 changed files with 13 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fuse/filecache.c
View File

@@ -136,7 +136,6 @@ static int filecache_download_file(const char *filecache_path,
file = file_alloc();
retval = mfconn_api_file_get_links(conn, file, (char *)quickkey);
mfconn_update_secret_key(conn);
if (retval == -1) {
fprintf(stderr, "mfconn_api_file_get_links failed\n");
@@ -187,7 +186,6 @@ static int filecache_update_file(const char *filecache_path, mfconn * conn,
retval = mfconn_api_device_get_updates(conn, quickkey,
local_revision, remote_revision,
&patches);
mfconn_update_secret_key(conn);
if (retval != 0) {
fprintf(stderr, "device/get_updates api call unsuccessful\n");
@@ -305,7 +303,6 @@ static int filecache_download_patch(mfconn * conn, const char *quickkey,
patch = patch_alloc();
retval = mfconn_api_device_get_patch(conn, patch, quickkey,
source_revision, target_revision);
mfconn_update_secret_key(conn);
if (retval == -1) {
fprintf(stderr, "mfconn_api_device_get_patch failed\n");

7
fuse/hashtbl.c
View File

@@ -1076,7 +1076,6 @@ static int folder_tree_rebuild_helper(folder_tree * tree, mfconn * conn,
retval =
mfconn_api_folder_get_content(conn, 0, curr_entry->key, &folder_result,
NULL);
mfconn_update_secret_key(conn);
if (retval != 0) {
fprintf(stderr, "folder/get_content failed\n");
if (folder_result != NULL) {
@@ -1105,7 +1104,6 @@ static int folder_tree_rebuild_helper(folder_tree * tree, mfconn * conn,
retval =
mfconn_api_folder_get_content(conn, 1, curr_entry->key, NULL,
&file_result);
mfconn_update_secret_key(conn);
if (retval != 0) {
fprintf(stderr, "folder/get_content failed\n");
if (file_result != NULL) {
@@ -1270,7 +1268,6 @@ static int folder_tree_update_file_info(folder_tree * tree, mfconn * conn,
file = file_alloc();
retval = mfconn_api_file_get_info(conn, file, key);
mfconn_update_secret_key(conn);
if (retval != 0) {
fprintf(stderr, "api call unsuccessful\n");
/* maybe there is a different reason but for now just assume that an
@@ -1332,7 +1329,6 @@ static int folder_tree_update_folder_info(folder_tree * tree, mfconn * conn,
folder = folder_alloc();
retval = mfconn_api_folder_get_info(conn, folder, key);
mfconn_update_secret_key(conn);
if (retval != 0) {
fprintf(stderr, "api call unsuccessful\n");
/* maybe there is a different reason but for now just assume that an
@@ -1393,7 +1389,6 @@ void folder_tree_update(folder_tree * tree, mfconn * conn, bool expect_changes)
if (!expect_changes) {
mfconn_api_device_get_status(conn, &revision_remote);
mfconn_update_secret_key(conn);
if (tree->revision == revision_remote) {
fprintf(stderr, "Request to update but nothing to do\n");
@@ -1419,7 +1414,6 @@ void folder_tree_update(folder_tree * tree, mfconn * conn, bool expect_changes)
changes = NULL;
retval = mfconn_api_device_get_changes(conn, tree->revision, &changes);
mfconn_update_secret_key(conn);
if (retval != 0) {
fprintf(stderr, "device/get_changes() failed\n");
free(changes);
@@ -1542,7 +1536,6 @@ int folder_tree_rebuild(folder_tree * tree, mfconn * conn)
/* get remote device revision before walking the tree */
ret = mfconn_api_device_get_status(conn, &revision_before);
mfconn_update_secret_key(conn);
if (ret != 0) {
fprintf(stderr, "device/get_status call unsuccessful\n");
return -1;

4
fuse/operations.c
View File

@@ -220,7 +220,6 @@ int mediafirefs_mkdir(const char *path, mode_t mode)
}
retval = mfconn_api_folder_create(ctx->conn, key, basename);
mfconn_update_secret_key(ctx->conn);
if (retval != 0) {
fprintf(stderr, "mfconn_api_folder_create unsuccessful\n");
// FIXME: find better errno in this case
@@ -257,7 +256,6 @@ int mediafirefs_rmdir(const char *path)
}
retval = mfconn_api_folder_delete(ctx->conn, key);
mfconn_update_secret_key(ctx->conn);
if (retval != 0) {
fprintf(stderr, "mfconn_api_folder_create unsuccessful\n");
// FIXME: find better errno in this case
@@ -293,7 +291,6 @@ int mediafirefs_unlink(const char *path)
}
retval = mfconn_api_file_delete(ctx->conn, key);
mfconn_update_secret_key(ctx->conn);
if (retval != 0) {
fprintf(stderr, "mfconn_api_file_create unsuccessful\n");
// FIXME: find better errno in this case
@@ -431,7 +428,6 @@ int mediafirefs_release(const char *path, struct fuse_file_info *file_info)
retval = mfconn_api_upload_simple(ctx->conn, folder_key,
fh, file_name, &upload_key);
mfconn_update_secret_key(ctx->conn);
fclose(fh);
free(temp1);