use gnu indent to enforce coding style and adapt source

- indent options are listed in ./.indent.pro
 - use test case to run indent
This commit is contained in:
josch
2014-09-20 10:59:54 +02:00
parent d8e00119b4
commit 097a855751
43 changed files with 1325 additions and 1278 deletions

View File

@@ -17,7 +17,6 @@
*
*/
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
@@ -29,122 +28,128 @@
#include "../utils/strings.h"
#include "file.h"
struct mffile {
char quickkey[18];
char hash[65];
char name[256];
char mtime[16];
uint64_t revision;
struct mffile
{
char quickkey[18];
char hash[65];
char name[256];
char mtime[16];
uint64_t revision;
char *share_link;
char *direct_link;
char *onetime_link;
char *share_link;
char *direct_link;
char *onetime_link;
};
mffile*
file_alloc(void)
mffile *file_alloc(void)
{
mffile *file;
mffile *file;
file = (mffile*)calloc(1,sizeof(mffile));
file = (mffile *) calloc(1, sizeof(mffile));
return file;
}
void
file_free(mffile *file)
void file_free(mffile * file)
{
if(file == NULL) return;
if (file == NULL)
return;
if(file->share_link != NULL) free(file->share_link);
if(file->direct_link != NULL) free(file->direct_link);
if(file->onetime_link != NULL) free(file->onetime_link);
if (file->share_link != NULL)
free(file->share_link);
if (file->direct_link != NULL)
free(file->direct_link);
if (file->onetime_link != NULL)
free(file->onetime_link);
free(file);
return;
}
int
file_set_key(mffile *file,const char *key)
int file_set_key(mffile * file, const char *key)
{
int len;
int len;
if(file == NULL) return -1;
if(key == NULL) return -1;
if (file == NULL)
return -1;
if (key == NULL)
return -1;
len = strlen(key);
if(len != 11 && len != 15) return -1;
if (len != 11 && len != 15)
return -1;
memset(file->quickkey,0,sizeof(file->quickkey));
strncpy(file->quickkey,key,sizeof(file->quickkey) - 1);
memset(file->quickkey, 0, sizeof(file->quickkey));
strncpy(file->quickkey, key, sizeof(file->quickkey) - 1);
return 0;
}
const char*
file_get_key(mffile *file)
const char *file_get_key(mffile * file)
{
if(file == NULL) return NULL;
if (file == NULL)
return NULL;
return file->quickkey;
}
int
file_set_hash(mffile *file,const char *hash)
int file_set_hash(mffile * file, const char *hash)
{
if(file == NULL) return -1;
if(hash == NULL) return -1;
if (file == NULL)
return -1;
if (hash == NULL)
return -1;
// system supports SHA256 (current) and MD5 (legacy)
if(strlen(hash) < 32) return -1;
if (strlen(hash) < 32)
return -1;
memset(file->hash,0,sizeof(file->hash));
strncpy(file->hash,hash,sizeof(file->hash) - 1);
memset(file->hash, 0, sizeof(file->hash));
strncpy(file->hash, hash, sizeof(file->hash) - 1);
return 0;
}
const char*
file_get_hash(mffile *file)
const char *file_get_hash(mffile * file)
{
if(file == NULL) return NULL;
if (file == NULL)
return NULL;
return file->hash;
}
int
file_set_name(mffile *file,const char *name)
int file_set_name(mffile * file, const char *name)
{
if(file == NULL) return -1;
if(name == NULL) return -1;
if (file == NULL)
return -1;
if (name == NULL)
return -1;
if(strlen(name) > 255) return -1;
if (strlen(name) > 255)
return -1;
memset(file->name,0,sizeof(file->name));
strncpy(file->name,name,sizeof(file->name) - 1);
memset(file->name, 0, sizeof(file->name));
strncpy(file->name, name, sizeof(file->name) - 1);
return 0;
}
const char*
file_get_name(mffile *file)
const char *file_get_name(mffile * file)
{
if(file == NULL) return NULL;
if (file == NULL)
return NULL;
return file->name;
}
int
file_set_share_link(mffile *file,const char *share_link)
int file_set_share_link(mffile * file, const char *share_link)
{
if(file == NULL) return -1;
if(share_link == NULL) return -1;
if (file == NULL)
return -1;
if (share_link == NULL)
return -1;
if(file->share_link != NULL)
{
if (file->share_link != NULL) {
free(file->share_link);
file->share_link = NULL;
}
@@ -154,22 +159,22 @@ file_set_share_link(mffile *file,const char *share_link)
return 0;
}
const char*
file_get_share_link(mffile *file)
const char *file_get_share_link(mffile * file)
{
if(file == NULL) return NULL;
if (file == NULL)
return NULL;
return file->share_link;
}
int
file_set_direct_link(mffile *file,const char *direct_link)
int file_set_direct_link(mffile * file, const char *direct_link)
{
if(file == NULL) return -1;
if(direct_link == NULL) return -1;
if (file == NULL)
return -1;
if (direct_link == NULL)
return -1;
if(file->direct_link != NULL)
{
if (file->direct_link != NULL) {
free(file->direct_link);
file->direct_link = NULL;
}
@@ -179,22 +184,22 @@ file_set_direct_link(mffile *file,const char *direct_link)
return 0;
}
const char*
file_get_direct_link(mffile *file)
const char *file_get_direct_link(mffile * file)
{
if(file == NULL) return NULL;
if (file == NULL)
return NULL;
return file->direct_link;
}
int
file_set_onetime_link(mffile *file,const char *onetime_link)
int file_set_onetime_link(mffile * file, const char *onetime_link)
{
if(file == NULL) return -1;
if(onetime_link == NULL) return -1;
if (file == NULL)
return -1;
if (onetime_link == NULL)
return -1;
if(file->onetime_link != NULL)
{
if (file->onetime_link != NULL) {
free(file->onetime_link);
file->onetime_link = NULL;
}
@@ -204,53 +209,59 @@ file_set_onetime_link(mffile *file,const char *onetime_link)
return 0;
}
const char*
file_get_onetime_link(mffile *file)
const char *file_get_onetime_link(mffile * file)
{
if(file == NULL) return NULL;
if (file == NULL)
return NULL;
return file->onetime_link;
}
ssize_t
file_download_direct(mffile *file, char *local_dir)
ssize_t file_download_direct(mffile * file, char *local_dir)
{
const char *url;
const char *file_name;
char *file_path;
const char *url;
const char *file_name;
char *file_path;
struct stat file_info;
ssize_t bytes_read = 0;
int retval;
mfhttp *conn;
if(file == NULL) return -1;
if(local_dir == NULL) return -1;
if (file == NULL)
return -1;
if (local_dir == NULL)
return -1;
url = file_get_direct_link(file);
if(url == NULL) return -1;
if (url == NULL)
return -1;
file_name = file_get_name(file);
if(file_name == NULL) return -1;
if(strlen(file_name) < 1) return -1;
if (file_name == NULL)
return -1;
if (strlen(file_name) < 1)
return -1;
if(local_dir[strlen(local_dir) - 1] == '/')
file_path = strdup_printf("%s%s",local_dir,file_name);
if (local_dir[strlen(local_dir) - 1] == '/')
file_path = strdup_printf("%s%s", local_dir, file_name);
else
file_path = strdup_printf("%s/%s",local_dir,file_name);
file_path = strdup_printf("%s/%s", local_dir, file_name);
mfhttp *conn = http_create();
conn = http_create();
retval = http_get_file(conn, url, file_path);
http_destroy(conn);
/*
it is preferable to have the vfs tell us how many bytes the
transfer actually is. it's really all that matters.
*/
memset(&file_info,0,sizeof(file_info));
retval = stat(file_path,&file_info);
it is preferable to have the vfs tell us how many bytes the
transfer actually is. it's really all that matters.
*/
memset(&file_info, 0, sizeof(file_info));
retval = stat(file_path, &file_info);
free(file_path);
if(retval != 0) return -1;
if (retval != 0)
return -1;
bytes_read = file_info.st_size;