!1031 newlib error处理

Merge pull request !1031 from 乔克叔叔/master
!1032 Fix : 配置LOSCFG_BASE_IPC_QUEUE_STATIC后编译错误
2023-03-01 08:13:50 +00:00 · 2023-03-01 08:09:53 +00:00 · 2023-03-01 08:09:16 +00:00 · 2023-03-01 11:52:34 +08:00 · 2023-02-27 15:12:13 +08:00 · 2023-02-27 11:53:54 +08:00
12 changed files with 29 additions and 28 deletions
--- a/components/net/lwip-2.1/enhancement/src/fixme.c
+++ b/components/net/lwip-2.1/enhancement/src/fixme.c
@@ -125,7 +125,7 @@ int ip6addr_aton(const char *cp, ip6_addr_t *addr)
    int squash_pos = ipv6_blocks;
    int i;
    const unsigned char *sc = (const unsigned char *)cp;
-    const char *ss = cp-1;
+    const unsigned char *ss = (const unsigned char *)(cp - 1);

    for (; ; sc++) {
        if (current_block_index >= ipv6_blocks) {
@@ -142,7 +142,7 @@ int ip6addr_aton(const char *cp, ip6_addr_t *addr)
            break;
        } else if (*sc == ':') {
            if (sc - ss == 1) {
-                if (sc != cp || sc[1] != ':') {
+                if (sc != (const unsigned char *)cp || sc[1] != ':') {
                    return 0; // address begins with a single ':' or contains ":::"
                } // else address begins with one valid "::"
            } else {
@@ -163,7 +163,7 @@ int ip6addr_aton(const char *cp, ip6_addr_t *addr)
 #if LWIP_IPV4
        } else if (*sc == '.' && current_block_index < ipv6_blocks - 1) {
            ip4_addr_t ip4;
-            int ret = ip4addr_aton(ss+1, &ip4);
+            int ret = ip4addr_aton((const char *)(ss + 1), &ip4);
            if (!ret) {
                return 0;
            }
--- a/kal/libc/newlib/porting/include/semaphore.h
+++ b/kal/libc/newlib/porting/include/semaphore.h
@@ -49,6 +49,7 @@ typedef struct {
 int    sem_init(sem_t *sem, int shared, unsigned value);
 int    sem_destroy(sem_t *sem);
 int    sem_wait(sem_t *sem);
+int    sem_trywait(sem_t *sem);
 int    sem_post(sem_t *sem);
 int    sem_timedwait(sem_t *__restrict sem, const struct timespec *__restrict timeout);
 int    sem_getvalue(sem_t *__restrict sem, int *__restrict currVal);
--- a/kal/libc/newlib/porting/include/sys/features.h
+++ b/kal/libc/newlib/porting/include/sys/features.h
@@ -50,6 +50,7 @@
 #define _POSIX_THREAD_PRIORITY_SCHEDULING
 #define _UNIX98_THREAD_MUTEX_ATTRIBUTES
 #define _POSIX_THREAD_PROCESS_SHARED
+#define _POSIX_PRIORITY_SCHEDULING

 #include_next <sys/features.h>

--- a/testsuites/sample/kernel/queue/It_los_queue_static_001.c
+++ b/testsuites/sample/kernel/queue/It_los_queue_static_001.c
@@ -39,7 +39,7 @@ static UINT32 Testcase(VOID)
    CHAR buff2[QUEUE_SHORT_BUFFER_LENGTH] = "";
    CHAR buff3[QUEUE_SHORT_BUFFER_LENGTH] = {0};

-    ret = LOS_QueueCreateStatic("Q1", QUEUE_BASE_NUM, &g_testQueueID01, buff3, 0, QUEUE_BASE_MSGSIZE);
+    ret = LOS_QueueCreateStatic("Q1", QUEUE_BASE_NUM, &g_testQueueID01, (UINT8 *)buff3, 0, QUEUE_BASE_MSGSIZE);
    ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);

    ret = LOS_QueueWrite(g_testQueueID01, &buff1, QUEUE_BASE_MSGSIZE, 0);
--- a/testsuites/sample/kernel/queue/It_los_queue_static_002.c
+++ b/testsuites/sample/kernel/queue/It_los_queue_static_002.c
@@ -43,7 +43,7 @@ static UINT32 Testcase(VOID)

    g_testQueueID01 = QUEUW_INVALID_VALUE;

-    ret = LOS_QueueCreateStatic("Q1", QUEUE_BASE_NUM, &g_testQueueID01, buff3, 0, 0);
+    ret = LOS_QueueCreateStatic("Q1", QUEUE_BASE_NUM, &g_testQueueID01, (UINT8 *)buff3, 0, 0);
    ICUNIT_GOTO_EQUAL(ret, LOS_ERRNO_QUEUE_PARA_ISZERO, ret, EXIT);

    ret = LOS_QueueWrite(g_testQueueID01, &buff1, QUEUE_BASE_MSGSIZE, 0);
--- a/testsuites/sample/kernel/queue/It_los_queue_static_003.c
+++ b/testsuites/sample/kernel/queue/It_los_queue_static_003.c
@@ -39,7 +39,7 @@ static UINT32 Testcase(VOID)
    CHAR buff2[QUEUE_SHORT_BUFFER_LENGTH] = "";
    CHAR buff3[QUEUE_SHORT_BUFFER_LENGTH] = {0};

-    ret = LOS_QueueCreateStatic("Q1", QUEUE_BASE_NUM, &g_testQueueID01, buff3, 0, 1);
+    ret = LOS_QueueCreateStatic("Q1", QUEUE_BASE_NUM, &g_testQueueID01, (UINT8 *)buff3, 0, 1);
    ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);

    ret = LOS_QueueWrite(g_testQueueID01, &buff1, QUEUE_BASE_MSGSIZE, 0);
--- a/testsuites/sample/kernel/queue/It_los_queue_static_006.c
+++ b/testsuites/sample/kernel/queue/It_los_queue_static_006.c
@@ -43,7 +43,7 @@ static UINT32 Testcase(VOID)

    g_testQueueID01 = QUEUW_INVALID_VALUE;

-    ret = LOS_QueueCreateStatic("Q1", QUEUE_BASE_NUM, NULL, buff3, 0, QUEUE_BASE_MSGSIZE);
+    ret = LOS_QueueCreateStatic("Q1", QUEUE_BASE_NUM, NULL, (UINT8 *)buff3, 0, QUEUE_BASE_MSGSIZE);
    ICUNIT_GOTO_EQUAL(ret, LOS_ERRNO_QUEUE_CREAT_PTR_NULL, ret, EXIT);

    ret = LOS_QueueWrite(g_testQueueID01, &buff1, QUEUE_BASE_MSGSIZE, 0);
--- a/testsuites/sample/posix/pthread/It_posix_pthread.h
+++ b/testsuites/sample/posix/pthread/It_posix_pthread.h
@@ -64,7 +64,6 @@
 #define PTHREAD_EXISTED_SEM_NUM SEM_EXISTED_NUM

 /* We are testing conformance to IEEE Std 1003.1, 2003 Edition */
-#define _POSIX_C_SOURCE 200112L

 #define PRIORITY_OTHER (-1)
 #define PRIORITY_FIFO 20
--- a/testsuites/unittest/posix/src/ctype/tolower_test.c
+++ b/testsuites/unittest/posix/src/ctype/tolower_test.c
@@ -76,7 +76,7 @@ LITE_TEST_CASE(PosixCTypeTolowerTest, testCTypeTolower001, Function | MediumTest
    if (ret == 'a') {
        LOG("[DEMO] posix ctype test case 1:tolower(%c)==%c ok.\n", a, ret);
    } else {
-        LOG("[DEMO] posix ctype test case 1:tolower(%c)!=%c  fail.\n", a);
+        LOG("[DEMO] posix ctype test case 1:tolower(%c)!=%c  fail.\n", a, ret);
    }
    TEST_ASSERT_TRUE(ret == 'a');
    return 0;
@@ -94,7 +94,7 @@ LITE_TEST_CASE(PosixCTypeTolowerTest, testCTypeTolower002, Function | MediumTest
    if (ret == 'a') {
        LOG("[DEMO] posix ctype test case 2:tolower(%c)==%c ok.\n", a, ret);
    } else {
-        LOG("[DEMO] posix ctype test case 2:tolower(%c)!=%c  fail.\n", a);
+        LOG("[DEMO] posix ctype test case 2:tolower(%c)!=%c  fail.\n", a, ret);
    }
    TEST_ASSERT_TRUE(ret == 'a');
    return 0;
@@ -112,7 +112,7 @@ LITE_TEST_CASE(PosixCTypeTolowerTest, testCTypeTolower003, Function | MediumTest
    if (ret == 'z') {
        LOG("[DEMO] posix ctype test case 3:tolower(%c)==%c ok.\n", a, ret);
    } else {
-        LOG("[DEMO] posix ctype test case 3:tolower(%c)!=%c  fail.\n", a);
+        LOG("[DEMO] posix ctype test case 3:tolower(%c)!=%c  fail.\n", a, ret);
    }
    TEST_ASSERT_TRUE(ret == 'z');
    return 0;
@@ -130,7 +130,7 @@ LITE_TEST_CASE(PosixCTypeTolowerTest, testCTypeTolower004, Function | MediumTest
    if (ret == 'z') {
        LOG("[DEMO] posix ctype test case 4:tolower(%c)==%c ok.\n", a, ret);
    } else {
-        LOG("[DEMO] posix ctype test case 4:tolower(%c)!=%c  fail.\n", a);
+        LOG("[DEMO] posix ctype test case 4:tolower(%c)!=%c  fail.\n", a, ret);
    }
    TEST_ASSERT_TRUE(ret == 'z');
    return 0;
@@ -148,7 +148,7 @@ LITE_TEST_CASE(PosixCTypeTolowerTest, testCTypeTolower005, Function | MediumTest
    if (ret == '1') {
        LOG("[DEMO] posix ctype test case 5(except):tolower(%c)==%c ok.\n", a, ret);
    } else {
-        LOG("[DEMO] posix ctype test case 5(except):tolower(%c)!=%c  fail.\n", a);
+        LOG("[DEMO] posix ctype test case 5(except):tolower(%c)!=%c  fail.\n", a, ret);
    }
    TEST_ASSERT_TRUE(ret == '1');
    return 0;
--- a/testsuites/unittest/posix/src/ctype/toupper_test.c
+++ b/testsuites/unittest/posix/src/ctype/toupper_test.c
@@ -76,7 +76,7 @@ LITE_TEST_CASE(PosixCTypeToupperTest, testCTypeToupper001, Function | MediumTest
    if (ret == 'A') {
        LOG("[DEMO] posix ctype test case 1:toupper(%c)==%c ok.\n", a, ret);
    } else {
-        LOG("[DEMO] posix ctype test case 1:toupper(%c)!=%c  fail.\n", a);
+        LOG("[DEMO] posix ctype test case 1:toupper(%c)!=%c  fail.\n", a, ret);
    }
    TEST_ASSERT_TRUE(ret == 'A');
    return 0;
@@ -94,7 +94,7 @@ LITE_TEST_CASE(PosixCTypeToupperTest, testCTypeToupper002, Function | MediumTest
    if (ret == 'A') {
        LOG("[DEMO] posix ctype test case 2:toupper(%c)==%c ok.\n", a, ret);
    } else {
-        LOG("[DEMO] posix ctype test case 2:toupper(%c)!=%c  fail.\n", a);
+        LOG("[DEMO] posix ctype test case 2:toupper(%c)!=%c  fail.\n", a, ret);
    }
    TEST_ASSERT_TRUE(ret == 'A');
    return 0;
@@ -112,7 +112,7 @@ LITE_TEST_CASE(PosixCTypeToupperTest, testCTypeToupper003, Function | MediumTest
    if (ret == 'Z') {
        LOG("[DEMO] posix ctype test case 3:toupper(%c)==%c ok.\n", a, ret);
    } else {
-        LOG("[DEMO] posix ctype test case 3:toupper(%c)!=%c  fail.\n", a);
+        LOG("[DEMO] posix ctype test case 3:toupper(%c)!=%c  fail.\n", a, ret);
    }
    TEST_ASSERT_TRUE(ret == 'Z');
    return 0;
@@ -130,7 +130,7 @@ LITE_TEST_CASE(PosixCTypeToupperTest, testCTypeToupper004, Function | MediumTest
    if (ret == 'Z') {
        LOG("[DEMO] posix ctype test case 4:toupper(%c)==%c ok.\n", a, ret);
    } else {
-        LOG("[DEMO] posix ctype test case 4:toupper(%c)!=%c  fail.\n", a);
+        LOG("[DEMO] posix ctype test case 4:toupper(%c)!=%c  fail.\n", a, ret);
    }
    TEST_ASSERT_TRUE(ret == 'Z');
    return 0;
@@ -148,7 +148,7 @@ LITE_TEST_CASE(PosixCTypeToupperTest, testCTypeToupper005, Function | MediumTest
    if (ret == '1') {
        LOG("[DEMO] posix ctype test case 5(except):toupper(%c)==%c ok.\n", a, ret);
    } else {
-        LOG("[DEMO] posix ctype test case 5(except):toupper(%c)!=%c  fail.\n", a);
+        LOG("[DEMO] posix ctype test case 5(except):toupper(%c)!=%c  fail.\n", a, ret);
    }
    TEST_ASSERT_TRUE(ret == '1');
    return 0;
--- a/testsuites/unittest/posix/src/semaphore/semaphore_func_test.c
+++ b/testsuites/unittest/posix/src/semaphore/semaphore_func_test.c
@@ -71,7 +71,7 @@ static BOOL PosixSemaphoreFuncTestSuiteTearDown(void)
 // get cur-time plus ms
 struct timespec GetDelayedTime(unsigned int ms)
 {
-    LOG("GetDelayedTime ms = %lu", ms);
+    LOG("GetDelayedTime ms = %u", ms);
    struct timespec ts = { 0 };
    const unsigned int nsecPerSec = 1000000000;
    const unsigned int nsecPerMs = 1000000;
@@ -91,7 +91,7 @@ int GetTimeDiff(struct timespec ts1, struct timespec ts2)
    const int nsecPerMs = 1000000;
    int ms = (ts1.tv_sec - ts2.tv_sec) * nsecPerSec + (ts1.tv_nsec - ts2.tv_nsec);
    ms = ms / nsecPerMs;
-    LOG("different result: %ld (ms)", ms);
+    LOG("different result: %d (ms)", ms);
    return ms;
 }

@@ -109,7 +109,7 @@ LITE_TEST_CASE(PosixSemaphoreFuncTestSuite, testIpcSem_Timedwait001, Function |
    TEST_ASSERT_EQUAL_INT(0, sem_init((sem_t *)&sem, 0, 0));

    ts = GetDelayedTime(100);
-    LOG("predicted time:%lld, %d", ts.tv_sec, ts.tv_nsec);
+    LOG("predicted time:%lld, %ld", ts.tv_sec, ts.tv_nsec);
    if (sem_timedwait((sem_t *)&sem, &ts) == -1) {
        TEST_ASSERT_EQUAL_INT(ETIMEDOUT, errno);
    } else {
@@ -117,7 +117,7 @@ LITE_TEST_CASE(PosixSemaphoreFuncTestSuite, testIpcSem_Timedwait001, Function |
    }

    clock_gettime(CLOCK_REALTIME, &tsNow);
-    LOG("tsNow %lld, %d", tsNow.tv_sec, tsNow.tv_nsec);
+    LOG("tsNow %lld, %ld", tsNow.tv_sec, tsNow.tv_nsec);
    int timeDiff = GetTimeDiff(tsNow, ts); // calculate time different
    LOG("timeDiff %d", timeDiff);
    TEST_ASSERT_LESS_THAN_INT(20, abs(timeDiff));
@@ -141,26 +141,26 @@ LITE_TEST_CASE(PosixSemaphoreFuncTestSuite, testIpcSem_Timedwait002, Function |
    TEST_ASSERT_EQUAL_INT(0, sem_init((sem_t *)&sem, 0, 1));

    ts = GetDelayedTime(100);
-    LOG("\n ts %lld, %d", ts.tv_sec, ts.tv_nsec);
+    LOG("\n ts %lld, %ld", ts.tv_sec, ts.tv_nsec);
    clock_gettime(CLOCK_REALTIME, &tsBegin);
    int ret = sem_timedwait((sem_t *)&sem, &ts);
    clock_gettime(CLOCK_REALTIME, &tsNow);

    TEST_ASSERT_EQUAL_INT(0, ret);

-    LOG("\n tsBegin %ld, %ld, tsNow %ld, %ld", tsBegin.tv_sec, tsBegin.tv_nsec, tsNow.tv_sec, tsNow.tv_nsec);
+    LOG("\n tsBegin %lld, %ld, tsNow %lld, %ld", tsBegin.tv_sec, tsBegin.tv_nsec, tsNow.tv_sec, tsNow.tv_nsec);
    int timeDiff = GetTimeDiff(tsNow, tsBegin); // calculate time different
    LOG("\n timeDiff %d", timeDiff);
    TEST_ASSERT_LESS_THAN_INT(20, timeDiff);

    // try get semaphore again
    ts = GetDelayedTime(100);
-    LOG("\n ts %d, %d", ts.tv_sec, ts.tv_nsec);
+    LOG("\n ts %lld, %ld", ts.tv_sec, ts.tv_nsec);
    ret = sem_timedwait((sem_t *)&sem, &ts);
    clock_gettime(CLOCK_REALTIME, &tsNow);
    TEST_ASSERT_EQUAL_INT(-1, ret);
    TEST_ASSERT_EQUAL_INT(ETIMEDOUT, errno);
-    LOG("\n tsNow %ld, %ld", tsNow.tv_sec, tsNow.tv_nsec);
+    LOG("\n tsNow %lld, %ld", tsNow.tv_sec, tsNow.tv_nsec);
    timeDiff = GetTimeDiff(tsNow, tsBegin); // calculate time different
    LOG("\n wait timeDiff %d", timeDiff);

--- a/testsuites/unittest/posix/src/time/time_func_test_01.c
+++ b/testsuites/unittest/posix/src/time/time_func_test_01.c
@@ -101,7 +101,7 @@ static int KeepRun(int msec)
    struct timespec time1 = { 0, 0 };
    struct timespec time2 = { 0, 0 };
    clock_gettime(CLOCK_MONOTONIC, &time1);
-    LOG("KeepRun start : tv_sec=%ld, tv_nsec=%ld\n", time1.tv_sec, time1.tv_nsec);
+    LOG("KeepRun start : tv_sec=%lld, tv_nsec=%ld\n", time1.tv_sec, time1.tv_nsec);
    int loop = 0;
    int ran = 0;
    while (ran < msec) {
@@ -111,7 +111,7 @@ static int KeepRun(int msec)
        ran += (time2.tv_nsec - time1.tv_nsec) / NANOSECONDS_PER_MILLISECOND;
    }

-    LOG("KeepRun end : tv_sec=%ld, tv_nsec=%ld\n", time2.tv_sec, time2.tv_nsec);
+    LOG("KeepRun end : tv_sec=%lld, tv_nsec=%ld\n", time2.tv_sec, time2.tv_nsec);
    return loop;
 }
Author	SHA1	Message	Date
openharmony_ci	36d55955ef	!1031 newlib error处理 Merge pull request !1031 from 乔克叔叔/master	2023-03-01 08:13:50 +00:00
openharmony_ci	12f6c5d628	!1032 Fix : 配置LOSCFG_BASE_IPC_QUEUE_STATIC后编译错误 Merge pull request !1032 from yinjiaming/fix-1	2023-03-01 08:09:53 +00:00
openharmony_ci	17309e232a	!1029 Fix : 打开 LWIP_IPV6 时会有编译错误 Merge pull request !1029 from yinjiaming/fix	2023-03-01 08:09:16 +00:00
liuwenxin	af1afcec6a	fix:newlib error解决 close:#I6HL01 Signed-off-by: liuwenxin <liuwenxin11@huawei.com>	2023-03-01 11:52:34 +08:00
yinjiaming	9cef4da850	fix:配置LOSCFG_BASE_IPC_QUEUE_STATIC后编译错误在target_config.h中配置了LOSCFG_BASE_IPC_QUEUE_STATIC之后编译内核测试套报错现修复 Signed-off-by: yinjiaming <yinjiaming@huawei.com> Change-Id: Idf99137f822d5040bdb19e489e0a9234f19e93be	2023-02-27 15:12:13 +08:00
yinjiaming	d058b640e2	fix:打开LWIP_IPV6时有编译错误更改了出错的参与算数运算的指针的数据类型 Signed-off-by: yinjiaming <yinjiaming@huawei.com> Change-Id: I6891797cd1afa801faeecf1bfb891f0ac7db7f68	2023-02-27 11:53:54 +08:00