X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftimothy_tests%2Fquick_tests%2Flib.c;h=a7219c59f31d303f31ac2757902ae2fba19278d9;hp=39b0713384d02acf6386a61c7b8304abf50cc9bd;hb=a32621e0d7f5f391e9152cfe710fa6c99ca44c50;hpb=4adb62b1e4338eaa34d02fdcb0c5d99cebea6747 diff --git a/direct/timothy_tests/quick_tests/lib.c b/direct/timothy_tests/quick_tests/lib.c index 39b0713..a7219c5 100644 --- a/direct/timothy_tests/quick_tests/lib.c +++ b/direct/timothy_tests/quick_tests/lib.c @@ -14,7 +14,8 @@ #include "lib.h" -void join_paths(char *path1,char *path2,char *new_path ){ +void join_paths(char *path1,char *path2,char *new_path ) +{ //strcat(new_path,path1); /*since all functions have this then pull it out*/ if ( (path1[(sizeof(path1)/sizeof(char))-2]=='/') && path2[0]!='/') { @@ -24,31 +25,35 @@ void join_paths(char *path1,char *path2,char *new_path ){ //char new_path[(sizeof(path1)/sizeof(char))+(sizeof(path2)/sizeof(char))]; //strcpy(new_path,strcat(path1,path2)); //return new_path; - } - else if ((path1[(sizeof(path1)/sizeof(char))-2]!='/') && path2[0]=='/') { + } else if ((path1[(sizeof(path1)/sizeof(char))-2]!='/') && path2[0]=='/') { /*paths are compatiable. concatanate them*/ strcat(new_path,path1); strcat(new_path,path2); - } - else if ((path1[(sizeof(path1)/sizeof(char))-2]!='/') && path2[0]!='/') { + } else if ((path1[(sizeof(path1)/sizeof(char))-2]!='/') && path2[0]!='/') { /*need to add a "/". */ strcat(new_path,path1); strcat(new_path,"/"); strcat(new_path,path2); - - } - else if ((path1[(sizeof(path1)/sizeof(char))-2]=='/') && path2[0]=='/') { + } else if ((path1[(sizeof(path1)/sizeof(char))-2]=='/') && path2[0]=='/') { /*need to remove a "/". */ /*yaffs does not mind the extra slash. */ strcat(new_path,path1); strcat(new_path,path2); - } - else{ + } else { //error //return -1; } } +void print_message(char *message,char print_level) +{ + if (print_level <= PRINT_LEVEL){ + printf(message); + } +} + + +