Skip to content

Commit c05a42f

Browse files
committed
Merge pull request #459 from thnkslprpt:fix-458-fix-bug-in-unistd-handler
Fix #458, Correct minor logic bug in UT_DefaultHandler_PCS_read
2 parents 02c776e + e5bfdbd commit c05a42f

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

unit-test-coverage/ut-stubs/src/PCS_string_handlers.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -165,17 +165,17 @@ void UT_DefaultHandler_PCS_strcat(void *UserObj, UT_EntryKey_t FuncKey, const UT
165165

166166
void UT_DefaultHandler_PCS_strncat(void *UserObj, UT_EntryKey_t FuncKey, const UT_StubContext_t *Context)
167167
{
168-
/* char *PCS_strncat(char *dest, const char *src, size_t size) */
168+
/* char *PCS_strncat(char *dest, const char *src, size_t n) */
169169
void * dest = UT_Hook_GetArgValueByName(Context, "dest", void *);
170170
const void *src = UT_Hook_GetArgValueByName(Context, "src", const void *);
171-
size_t size = UT_Hook_GetArgValueByName(Context, "size", size_t);
171+
size_t n = UT_Hook_GetArgValueByName(Context, "n", size_t);
172172

173173
char *Result;
174174

175175
if (!UT_Stub_GetInt32StatusCode(Context, NULL))
176176
{
177177
/* Perform the real operation */
178-
Result = strncat(dest, src, size);
178+
Result = strncat(dest, src, n);
179179
UT_Stub_SetReturnValue(FuncKey, Result);
180180
}
181181
}
@@ -215,33 +215,33 @@ void UT_DefaultHandler_PCS_strcmp(void *UserObj, UT_EntryKey_t FuncKey, const UT
215215

216216
void UT_DefaultHandler_PCS_strcpy(void *UserObj, UT_EntryKey_t FuncKey, const UT_StubContext_t *Context)
217217
{
218-
/* char *PCS_strcpy(char *dst, const char *src) */
219-
char * dst = UT_Hook_GetArgValueByName(Context, "dst", char *);
218+
/* char *PCS_strcpy(char *dest, const char *src) */
219+
char * dest = UT_Hook_GetArgValueByName(Context, "dest", char *);
220220
const char *src = UT_Hook_GetArgValueByName(Context, "src", const char *);
221221

222222
char *Result;
223223

224224
if (!UT_Stub_GetInt32StatusCode(Context, NULL))
225225
{
226226
/* Perform the real operation */
227-
Result = strcpy(dst, src);
227+
Result = strcpy(dest, src);
228228
UT_Stub_SetReturnValue(FuncKey, Result);
229229
}
230230
}
231231

232232
void UT_DefaultHandler_PCS_strncpy(void *UserObj, UT_EntryKey_t FuncKey, const UT_StubContext_t *Context)
233233
{
234-
/* char *PCS_strncpy(char *dst, const char *src, size_t size) */
235-
char * dst = UT_Hook_GetArgValueByName(Context, "dst", char *);
234+
/* char *PCS_strncpy(char *dest, const char *src, size_t n) */
235+
char * dest = UT_Hook_GetArgValueByName(Context, "dest", char *);
236236
const char *src = UT_Hook_GetArgValueByName(Context, "src", const char *);
237-
size_t size = UT_Hook_GetArgValueByName(Context, "size", size_t);
237+
size_t n = UT_Hook_GetArgValueByName(Context, "n", size_t);
238238

239239
char *Result;
240240

241241
if (!UT_Stub_GetInt32StatusCode(Context, NULL))
242242
{
243243
/* Perform the real operation */
244-
Result = strncpy(dst, src, size);
244+
Result = strncpy(dest, src, n);
245245
UT_Stub_SetReturnValue(FuncKey, Result);
246246
}
247247
}

unit-test-coverage/ut-stubs/src/PCS_unistd_handlers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ void UT_DefaultHandler_PCS_read(void *UserObj, UT_EntryKey_t FuncKey, const UT_S
9999
memset(buf, 'r', Status);
100100
retval = Status;
101101
}
102-
else if (UT_GetStubCount(FuncKey < 4))
102+
else if (UT_GetStubCount(FuncKey) < 4)
103103
{
104104
memset(buf, 'r', nbytes);
105105
retval = nbytes;

0 commit comments

Comments
 (0)