diff --git a/alloc.c b/alloc.c index 71854fbdc0bd6dcab32b3289927a9df33bd530fd..f55cd7b0d1893ab7f3ea47e2808a2eecd33cc303 100644 --- a/alloc.c +++ b/alloc.c @@ -18,14 +18,11 @@ void* m_malloc(size_t size) end = start; } - if(end == start) { block = -1; } - - meta* nextblk = end; end += size + sizeof(meta); @@ -40,9 +37,8 @@ void* m_malloc(size_t size) block = nextblk; - printf("%d %d ",nextblk->free,nextblk->size); - + return block->data; } @@ -59,8 +55,6 @@ void m_free(void *ptr) } } - void* m_realloc(void* ptr,size_t size){ - //GG } \ No newline at end of file diff --git a/main b/main index 47dd08ec469c02b29654aecca7f6a59ad652d804..3ea764348c56821a80cbde875b3127698f2c14e4 100755 Binary files a/main and b/main differ diff --git a/main.c b/main.c index 57dcb86a968a381885cc3e74b3eaa2247e5640cb..0a9a63b9c863ce5ef2e9813bc29afcaff3822e77 100644 --- a/main.c +++ b/main.c @@ -13,6 +13,11 @@ int main(int argc,char* argv[]) int line_num; // 1,2,3,4,5 int fit_type=0; + if(argc!=2) + { + printf("!!!!!Usage: ./main input.txt\n"); + return 0; + } FILE* fp = fopen(argv[1],"r"); @@ -39,7 +44,7 @@ int main(int argc,char* argv[]) return 0; } - char** lines = (char**)malloc(line_num * sizeof(char*)); + char** lines = (char**)m_malloc(line_num * sizeof(char*)); for(int i=0;i<line_num;i++) { @@ -55,12 +60,7 @@ int main(int argc,char* argv[]) continue; } } - //for(int i=0; i<line_num;i++) - //{ - // printf("%s\n", lines[i]); - //} - - + return 0; } \ No newline at end of file