Skip to content

Commit

Permalink
move canonical_server_url() to utils.c
Browse files Browse the repository at this point in the history
  • Loading branch information
caixiangyue committed Nov 5, 2019
1 parent ca0b056 commit 3b59c89
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 36 deletions.
12 changes: 0 additions & 12 deletions common/rpc-service.c
Original file line number Diff line number Diff line change
Expand Up @@ -735,18 +735,6 @@ cancel_clone_tasks_by_account (const char *account_server_url, const char *accou
g_list_free (tasks);
}

static char *
canonical_server_url (const char *url_in)
{
char *url = g_strdup(url_in);
int len = strlen(url);

if (url[len - 1] == '/')
url[len - 1] = 0;

return url;
}

int
seafile_unsync_repos_by_account (const char *server_url, const char *email, GError **error)
{
Expand Down
12 changes: 0 additions & 12 deletions daemon/clone-mgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -976,18 +976,6 @@ seaf_clone_manager_check_worktree_path (SeafCloneManager *mgr, const char *path,
return TRUE;
}

static char *
canonical_server_url (const char *url_in)
{
char *url = g_strdup(url_in);
int len = strlen(url);

if (url[len - 1] == '/')
url[len - 1] = 0;

return url;
}

static char *
add_task_common (SeafCloneManager *mgr,
const char *repo_id,
Expand Down
12 changes: 0 additions & 12 deletions daemon/repo-mgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -6682,18 +6682,6 @@ save_repo_property (SeafRepoManager *manager,
pthread_mutex_unlock (&manager->priv->db_lock);
}

static char *
canonical_server_url (const char *url_in)
{
char *url = g_strdup(url_in);
int len = strlen(url);

if (url[len - 1] == '/')
url[len - 1] = 0;

return url;
}

int
seaf_repo_manager_set_repo_property (SeafRepoManager *manager,
const char *repo_id,
Expand Down
12 changes: 12 additions & 0 deletions lib/utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -2466,3 +2466,15 @@ is_eml_file (const char *path)
ext = &path[len-4];
return (strcasecmp (ext, ".eml") == 0);
}

char *
canonical_server_url (const char *url_in)
{
char *url = g_strdup(url_in);
int len = strlen(url);

if (url[len - 1] == '/')
url[len - 1] = 0;

return url;
}
2 changes: 2 additions & 0 deletions lib/utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -396,4 +396,6 @@ is_permission_valid (const char *perm);
gboolean
is_eml_file (const char *path);

char *
canonical_server_url (const char *url_in);
#endif

0 comments on commit 3b59c89

Please sign in to comment.