瀏覽代碼

!3 Prevent memory leaks
Merge pull request !3 from 3swordman/master

彭睿扬 4 年之前
父節點
當前提交
c09fd03098
共有 3 個文件被更改,包括 9 次插入 和 8 次删除
  1. 3 3
      include/tripl/tripl.h
  2. 3 2
      main.c
  3. 3 3
      tripl.c

+ 3 - 3
include/tripl/tripl.h

@@ -25,6 +25,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <ctype.h>
 
 
 #define panic(msg, ...) 	error(msg, ##__VA_ARGS__); exit(1)
@@ -68,9 +69,8 @@
 	fprintf(stderr, "\n")
 
 
-#define isspace(c) 	(((c) == '\n') || ((c) == '\t') || ((c) == ' '))
-#define isnr(c) 	((c) >= '0' && (c) <= '9')
-#define ischr(c) 	(((c) >= 'A' && (c) <= 'Z') || ((c) >= 'a' && (c) <= 'z'))
+#define isnr 	isdigit
+#define ischr 	isalpha
 #define _skip_spaces(s) while (isspace(*(s))) (s)++;
 #define skip_spaces() 	_skip_spaces(line_buffer);
 #define _skip_word(s) 	while (!isspace(*(s))) (s)++; _skip_spaces(s)

+ 3 - 2
main.c

@@ -37,6 +37,7 @@ char	*basename, *fbuffer, *fname;
 int main(int argc, const char **argv) {
 	off_t 	fsize;
 	int 	fd;
+	int     return_code;
 
 	basename = (char *) argv[0];
 
@@ -64,12 +65,12 @@ int main(int argc, const char **argv) {
 	}
 
 
-	do_tripl_compile(fbuffer, fsize);
+	return_code = do_tripl_compile(fbuffer, fsize);
 
 	munmap(fbuffer, fsize);
 	close(fd);
 
-	return 0;
+	return return_code;
 }
 
 

+ 3 - 3
tripl.c

@@ -88,9 +88,9 @@ int do_tripl_compile(char *fbuffer, off_t fsize) {
 				goto ok;
 			}
 
-		printf("*** unsupported arch %s (got from $TRIPL_ARCH). \n", arch);
+		fprintf(stderr, "*** unsupported arch %s (got from $TRIPL_ARCH). \n", arch);
 
-		exit(1);
+		return 1;
 	}
 
 ok:	klist_init(&stack);
@@ -126,7 +126,7 @@ static char *__skip_comment(char *fbuffer) {
 }
 
 
-static int next_line(char *fbuffer __attribute__ ((unused))) {
+static int next_line(char *fbuffer) {
 	char *p;
 	
 	++lno;