diff --git a/interfaces/kits/samgr/common.h b/interfaces/kits/samgr/common.h index adc924c029f5816ff430cc39b92cb0fd6c7fda8c..2027c5cbefa119bb23e070af52f16d5c3e026022 100644 --- a/interfaces/kits/samgr/common.h +++ b/interfaces/kits/samgr/common.h @@ -108,7 +108,7 @@ typedef struct SimpleVector { /** Peak value of the number of stored data records. The initial value is 0. */ int16 top; /** Number of data records that have been released. The initial value is 0. */ - int16 free; + int16 vFree; /** Data storage pointer */ void **data; /** diff --git a/samgr/adapter/posix/thread_adapter.c b/samgr/adapter/posix/thread_adapter.c index adf7cb353beb5bc785f816e9d6f74441d48aa598..ffdd7758c8cbe91531f6d5b3466870cb360aaa69 100644 --- a/samgr/adapter/posix/thread_adapter.c +++ b/samgr/adapter/posix/thread_adapter.c @@ -80,8 +80,8 @@ ThreadId THREAD_Create(Runnable run, void *argv, const ThreadAttr *attr) pthread_attr_setschedparam(&threadAttr, &sched); (void) pthread_once(&g_localKeyOnce, KeyCreate); pthread_t threadId = 0; - int errno = pthread_create(&threadId, &threadAttr, run, argv); - if (errno != 0) { + int err = pthread_create(&threadId, &threadAttr, run, argv); + if (err != 0) { return NULL; } diff --git a/samgr/source/common.c b/samgr/source/common.c index cc23a7cdded3d864bfdfddeca67e4eaef78893bb..e43300c29b31708c1534254f37e54f7830c9a833 100644 --- a/samgr/source/common.c +++ b/samgr/source/common.c @@ -34,7 +34,7 @@ void VECTOR_Clear(Vector *vector) SAMGR_Free(vector->data); vector->max = 0; vector->top = 0; - vector->free = 0; + vector->vFree = 0; vector->data = NULL; } @@ -50,7 +50,7 @@ int16 VECTOR_Add(Vector *vector, void *element) for (i = vector->top - (int16)1; i >= 0; --i) { if (vector->data[i] == NULL) { vector->data[i] = element; - vector->free--; + vector->vFree--; return i; } } @@ -94,7 +94,7 @@ void *VECTOR_Swap(Vector *vector, int16 index, void *element) return NULL; } if (element == NULL) { - vector->free++; + vector->vFree++; } void *oldElement = vector->data[index]; vector->data[index] = element; @@ -150,5 +150,5 @@ int16 VECTOR_Num(Vector *vector) if (vector == NULL) { return INVALID_INDEX; } - return vector->top - vector->free; + return vector->top - vector->vFree; }