nuttx/libs/libc/stream/lib_libbsprintf.c
Xiang Xiao c32b683085 !compiler: drop CONFIG_HAVE_LONG_LONG and require long long support
Every compiler supported by NuttX provides the "long long" types,
so the CONFIG_HAVE_LONG_LONG indirection is no longer useful.
Remove the option from include/nuttx/compiler.h and treat
"long long" as unconditionally available across the OS.

In addition to deleting the guard itself, this commit unconditionally
enables the long-long flavored helpers that used to be gated behind
it:

  - libs/libc/fixedmath: drop the soft-emulated b32/ub32 routines
    in lib_fixedmath.c (-261 lines) and trim the matching
    prototypes, Make.defs and CMakeLists.txt entries; keep only
    the long-long backed implementations.
  - include/sys/endian.h, include/strings.h, libs/libc/string
    /lib_ffsll.c, lib_flsll.c: always expose the 64-bit byte-swap
    and ffsll/flsll variants.
  - libs/libm/libm/lib_llround{,f,l}.c: drop the empty stubs.
  - libs/libc/stdlib (atoll, llabs, lldiv, strtoll/ull, rand48,
    strtold), libs/libc/stream (libvsprintf, libvscanf,
    libbsprintf, ultoa_invert), libs/libc/misc (crc64, crc64emac),
    libs/libc/inttypes/strtoimax, libs/libc/lzf, libs/libc/libc.csv,
    libs/libc/string (memset, vikmemcpy): remove the
    #ifdef CONFIG_HAVE_LONG_LONG branches.
  - include/{stddef.h,stdlib.h,fixedmath.h,sys/epoll.h,cxx/cstdlib,
    nuttx/audio/audio.h,nuttx/crc64.h,nuttx/lib/math.h,
    nuttx/lib/math32.h,nuttx/lib/stdbit.h}: same guard cleanup.
  - drivers/note/note_driver.c, fs/spiffs/src/spiffs.h,
    sched/irq/irq_procfs.c: drop their local guards as well.
  - Documentation/applications/netutils/ntpclient/index.rst:
    refresh the documentation snippet.

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2026-05-19 16:21:28 +08:00

195 lines
5.2 KiB
C

/****************************************************************************
* libs/libc/stream/lib_libbsprintf.c
*
* SPDX-License-Identifier: Apache-2.0
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/streams.h>
#include <string.h>
#include <stdbool.h>
#include <stdlib.h>
/****************************************************************************
* Public Functions
****************************************************************************/
int lib_bsprintf(FAR struct lib_outstream_s *s, FAR const IPTR char *fmt,
FAR const void *buf)
{
begin_packed_struct union
{
char c;
char s[1];
short int si;
int i;
long l;
long long ll;
intmax_t im;
size_t sz;
ptrdiff_t pd;
uintptr_t p;
#ifdef CONFIG_HAVE_DOUBLE
float f;
double d;
# ifdef CONFIG_HAVE_LONG_DOUBLE
long double ld;
# endif
#endif
}
end_packed_struct *var;
FAR const char *prec = NULL;
FAR const char *data = buf;
char fmtstr[64];
bool infmt = false;
size_t offset = 0;
size_t ret = 0;
size_t len = 0;
char c;
while ((c = *fmt++) != '\0')
{
if (c != '%' && !infmt)
{
lib_stream_putc(s, c);
ret++;
continue;
}
if (!infmt)
{
len = 0;
infmt = true;
memset(fmtstr, 0, sizeof(fmtstr));
}
var = (FAR void *)(data + offset);
fmtstr[len++] = c;
if (c == 'c' || c == 'd' || c == 'i' || c == 'u' ||
c == 'o' || c == 'x' || c == 'X')
{
if (*(fmt - 2) == 'j')
{
offset += sizeof(var->im);
ret += lib_sprintf(s, fmtstr, var->im);
}
else if (*(fmt - 2) == 'l' && *(fmt - 3) == 'l')
{
offset += sizeof(var->ll);
ret += lib_sprintf(s, fmtstr, var->ll);
}
else if (*(fmt - 2) == 'l')
{
offset += sizeof(var->l);
ret += lib_sprintf(s, fmtstr, var->l);
}
else if (*(fmt - 2) == 'z')
{
offset += sizeof(var->sz);
ret += lib_sprintf(s, fmtstr, var->sz);
}
else if (*(fmt - 2) == 't')
{
offset += sizeof(var->pd);
ret += lib_sprintf(s, fmtstr, var->pd);
}
else if (*(fmt - 2) == 'h' && *(fmt - 3) == 'h')
{
offset += sizeof(var->c);
ret += lib_sprintf(s, fmtstr, var->c);
}
else if (*(fmt - 2) == 'h')
{
offset += sizeof(var->si);
ret += lib_sprintf(s, fmtstr, var->si);
}
else
{
offset += sizeof(var->i);
ret += lib_sprintf(s, fmtstr, var->i);
}
infmt = false;
}
else if (c == 'e' || c == 'f' || c == 'g' || c == 'a' ||
c == 'A' || c == 'E' || c == 'F' || c == 'G')
{
#ifdef CONFIG_HAVE_DOUBLE
if (*(fmt - 2) == 'h')
{
offset += sizeof(var->f);
ret += lib_sprintf(s, fmtstr, var->f);
}
# ifdef CONFIG_HAVE_LONG_DOUBLE
else if (*(fmt - 2) == 'L')
{
offset += sizeof(var->ld);
ret += lib_sprintf(s, fmtstr, var->ld);
}
# endif
else
{
offset += sizeof(var->d);
ret += lib_sprintf(s, fmtstr, var->d);
}
infmt = false;
#endif
}
else if (c == '*')
{
sprintf(fmtstr + len - 1, "%d", var->i);
len = strlen(fmtstr);
offset += sizeof(var->i);
}
else if (c == 's')
{
if (prec != NULL)
{
offset += strtol(prec, NULL, 10);
prec = NULL;
}
else
{
offset += strlen(var->s) + 1;
}
ret += lib_sprintf(s, fmtstr, var->s);
infmt = false;
}
else if (c == 'p')
{
offset += sizeof(var->p);
ret += lib_sprintf(s, fmtstr, var->p);
infmt = false;
}
else if (c == '.')
{
prec = fmt;
}
}
return ret;
}