@@ -299,22 +299,6 @@ CF_Logical_PduBuffer_t *CF_CFDP_ConstructPduHeader(const CF_Transaction_t *txn,
299
299
return ph ;
300
300
}
301
301
302
- /*----------------------------------------------------------------
303
- *
304
- * Internal helper routine only, not part of API.
305
- *
306
- *-----------------------------------------------------------------*/
307
- static inline size_t CF_strnlen (const char * str , size_t maxlen )
308
- {
309
- const char * end = memchr (str , 0 , maxlen );
310
- if (end != NULL )
311
- {
312
- /* actual length of string is difference */
313
- maxlen = end - str ;
314
- }
315
- return maxlen ;
316
- }
317
-
318
302
/*----------------------------------------------------------------
319
303
*
320
304
* Application-scope internal function
@@ -344,10 +328,10 @@ CFE_Status_t CF_CFDP_SendMd(CF_Transaction_t *txn)
344
328
/* at this point, need to append filenames into md packet */
345
329
/* this does not actually copy here - that is done during encode */
346
330
md -> source_filename .length =
347
- CF_strnlen (txn -> history -> fnames .src_filename , sizeof (txn -> history -> fnames .src_filename ));
331
+ OS_strnlen (txn -> history -> fnames .src_filename , sizeof (txn -> history -> fnames .src_filename ));
348
332
md -> source_filename .data_ptr = txn -> history -> fnames .src_filename ;
349
333
md -> dest_filename .length =
350
- CF_strnlen (txn -> history -> fnames .dst_filename , sizeof (txn -> history -> fnames .dst_filename ));
334
+ OS_strnlen (txn -> history -> fnames .dst_filename , sizeof (txn -> history -> fnames .dst_filename ));
351
335
md -> dest_filename .data_ptr = txn -> history -> fnames .dst_filename ;
352
336
353
337
CF_CFDP_EncodeMd (ph -> penc , md );
0 commit comments