From 370994b0b42b709837c130f0827e25ee2bf1c6cb Mon Sep 17 00:00:00 2001 From: "7u83@mail.ru" <7u83@mail.ru@noemail.net> Date: Sat, 31 Mar 2018 05:43:30 +0000 Subject: [PATCH] Reformatted. FossilOrigin-Name: b5bd38e7b93d1a297c35a2b4b912c607ce70150d2e2341841c826ac97c44294b --- actube.workspace | 4 ++-- src/cw/cw_filename.c | 57 +++++++++++++++++++++----------------------- 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/actube.workspace b/actube.workspace index 07586c53..e0162c79 100644 --- a/actube.workspace +++ b/actube.workspace @@ -1,11 +1,11 @@ - + - + diff --git a/src/cw/cw_filename.c b/src/cw/cw_filename.c index 17a1ac47..2c8e6ed6 100644 --- a/src/cw/cw_filename.c +++ b/src/cw/cw_filename.c @@ -31,52 +31,49 @@ * @return a pointer to the create filename which has to be * released using free. */ -char * cw_filename(const char * path, const char * name, const char * ext){ +char *cw_filename(const char *path, const char *name, const char *ext) +{ int name_len; - int ext_len; - int size=0; - + int ext_len; + int size = 0; + int path_len; char c; - char * result; - char * slash=""; - + char *result; + char *slash = ""; + path_len = strlen(path); - if (path_len>0){ - c = path[path_len-1]; - if (!strchr(CW_FILE_PATH_DELIMITERS,c)){ + if (path_len > 0) { + c = path[path_len - 1]; + if (!strchr(CW_FILE_PATH_DELIMITERS, c)) { path_len++; slash = "/"; } } - - name_len = strlen (name); - - - - if (ext != NULL){ - if (ext[0]=='.'){ + name_len = strlen(name); + + if (ext != NULL) { + if (ext[0] == '.') { ext++; } ext_len = strlen(ext); - } - else - ext_len=-1; + } else + ext_len = -1; - size = (path_len) + name_len + (ext_len+1) + 1; + size = (path_len) + name_len + (ext_len + 1) + 1; result = malloc(size); if (!result) return NULL; - - strncpy(result,path,path_len); - result[path_len]=0; - strcat(result,slash); - strcat(result,name); - if (ext){ - strcat(result,"."); - strcat(result,ext); + + strncpy(result, path, path_len); + result[path_len] = 0; + strcat(result, slash); + strcat(result, name); + if (ext) { + strcat(result, "."); + strcat(result, ext); } - + return result; }