From b7228c8620a6a0b593f1d8b82af5aac7ba456a85 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 28 七月 2020 17:12:17 +0800
Subject: [PATCH] fix conflict
---
test/test.c | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/test/test.c b/test/test.c
index 0aaa68e..d1193a6 100644
--- a/test/test.c
+++ b/test/test.c
@@ -1,15 +1,7 @@
#include "usg_common.h"
#include "usg_typedef.h"
-int test(char *src, int size) {
- int i = strlen(src);
- char dest[size];
- strncpy(dest, src, size);
- puts(dest);
- return i;
-}
+
int main() {
- char *str = "hello";
- int r = test(str, strlen(str));
- printf("%d\n", r);
-}
\ No newline at end of file
+}
+
\ No newline at end of file
--
Gitblit v1.8.0