sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib_sscanf.c: Remove some redundancy in debug output.

Browse Source
This commit is contained in:
Gregory Nutt 2019-02-10 07:47:58 -06:00
parent 810b5de41b
commit 675a9a170a
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libs/libc/stdio/lib_sscanf.c
View File

@ -1,7 +1,8 @@
/**************************************************************************** /****************************************************************************
* libs/libc/stdio/lib_sscanf.c * libs/libc/stdio/lib_sscanf.c
* *
* Copyright (C) 2007, 2008, 2011-2014, 2016 Gregory Nutt. All rights reserved. * Copyright (C) 2007, 2008, 2011-2014, 2016 Gregory Nutt. All rights
* reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -337,7 +338,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
unsigned char set[32]; /* Bit field (256 / 8) */ unsigned char set[32]; /* Bit field (256 / 8) */
#endif #endif
linfo("vsscanf: buf=\"%s\" fmt=\"%s\"\n", buf, fmt); linfo("buf=\"%s\" fmt=\"%s\"\n", buf, fmt);
/* Remember the start of the input buffer. We will need this for %n /* Remember the start of the input buffer. We will need this for %n
* calculations. * calculations.
@ -370,14 +371,14 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
if (*fmt == '%') if (*fmt == '%')
{ {
linfo("vsscanf: Specifier found\n"); linfo("Specifier found\n");
/* Check for qualifiers on the conversion specifier */ /* Check for qualifiers on the conversion specifier */
fmt++; fmt++;
for (; *fmt; fmt++) for (; *fmt; fmt++)
{ {
linfo("vsscanf: Processing %c\n", *fmt); linfo("Processing %c\n", *fmt);
#ifdef CONFIG_LIBC_SCANSET #ifdef CONFIG_LIBC_SCANSET
if (strchr("dibouxcsefgn[%", *fmt)) if (strchr("dibouxcsefgn[%", *fmt))
@ -412,7 +413,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
if (*fmt == 's') if (*fmt == 's')
{ {
linfo("vsscanf: Performing string conversion\n"); linfo("Performing string conversion\n");
/* Get a pointer to the char * value. We need to do this even /* Get a pointer to the char * value. We need to do this even
* if we have reached the end of the input data in order to * if we have reached the end of the input data in order to
@ -475,7 +476,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
if (*fmt == '[') if (*fmt == '[')
{ {
linfo("vsscanf: Performing scanset conversion\n"); linfo("Performing scanset conversion\n");
fmt = findscanset(fmt, set); /* find scanset */ fmt = findscanset(fmt, set); /* find scanset */
@ -540,7 +541,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
else if (*fmt == 'c') else if (*fmt == 'c')
{ {
linfo("vsscanf: Performing character conversion\n"); linfo("Performing character conversion\n");
/* Get a pointer to the char * value. We need to do this even /* Get a pointer to the char * value. We need to do this even
* if we have reached the end of the input data in order to * if we have reached the end of the input data in order to
@ -593,7 +594,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
FAR int *pint = NULL; FAR int *pint = NULL;
bool sign; bool sign;
linfo("vsscanf: Performing integer conversion\n"); linfo("Performing integer conversion\n");
/* Get a pointer to the integer value. We need to do this even /* Get a pointer to the integer value. We need to do this even
* if we have reached the end of the input data in order to * if we have reached the end of the input data in order to
@ -681,7 +682,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
strncpy(tmp, buf, width); strncpy(tmp, buf, width);
tmp[width] = '\0'; tmp[width] = '\0';
linfo("vsscanf: tmp[]=\"%s\"\n", tmp); linfo("tmp[]=\"%s\"\n", tmp);
/* Perform the integer conversion */ /* Perform the integer conversion */
/* Preserve the errno value */ /* Preserve the errno value */
@ -717,14 +718,12 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
if (lflag) if (lflag)
{ {
linfo("vsscanf: Return %ld to 0x%p\n", linfo("Return %ld to 0x%p\n", tmplong, plong);
tmplong, plong);
*plong = tmplong; *plong = tmplong;
} }
else else
{ {
linfo("vsscanf: Return %ld to 0x%p\n", linfo("Return %ld to 0x%p\n", tmplong, pint);
tmplong, pint);
*pint = (int)tmplong; *pint = (int)tmplong;
} }
@ -744,7 +743,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
#endif #endif
FAR float *pf = NULL; FAR float *pf = NULL;
linfo("vsscanf: Performing floating point conversion\n"); linfo("Performing floating point conversion\n");
/* Get a pointer to the double value. We need to do this even /* Get a pointer to the double value. We need to do this even
* if we have reached the end of the input data in order to * if we have reached the end of the input data in order to
@ -807,7 +806,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
strncpy(tmp, buf, width); strncpy(tmp, buf, width);
tmp[width] = '\0'; tmp[width] = '\0';
linfo("vsscanf: tmp[]=\"%s\"\n", tmp); linfo("tmp[]=\"%s\"\n", tmp);
/* Perform the floating point conversion */ /* Perform the floating point conversion */
/* Preserve the errno value */ /* Preserve the errno value */
@ -852,7 +851,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
{ {
/* Return the double value */ /* Return the double value */
linfo("vsscanf: Return %f to %p\n", dvalue, pd); linfo("Return %f to %p\n", dvalue, pd);
*pd = dvalue; *pd = dvalue;
} }
else else
@ -860,7 +859,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
{ {
/* Return the float value */ /* Return the float value */
linfo("vsscanf: Return %f to %p\n", (double)fvalue, pf); linfo("Return %f to %p\n", (double)fvalue, pf);
*pf = fvalue; *pf = fvalue;
} }
@ -874,7 +873,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
else if (*fmt == 'n') else if (*fmt == 'n')
{ {
linfo("vsscanf: Performing character count\n"); linfo("Performing character count\n");
if (!noassign) if (!noassign)
{ {