Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-05-19 13:49:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #770 from lassik/snprintf

Browse source 
Simplify snprintf usage
This commit is contained in:
Alex Shinn 2021-08-10 14:19:23 +09:00 • committed by GitHub
commit d10ea607e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/chibi/accept.c
View file

@ -95,7 +95,7 @@ sexp sexp_sockaddr_name (sexp ctx, sexp self, struct sockaddr* addr) {
char buf[INET6_ADDRSTRLEN]; char buf[INET6_ADDRSTRLEN];
/* struct sockaddr_in *sa = (struct sockaddr_in *)addr; */ /* struct sockaddr_in *sa = (struct sockaddr_in *)addr; */
/* unsigned char *ptr = (unsigned char *)&(sa->sin_addr); */ /* unsigned char *ptr = (unsigned char *)&(sa->sin_addr); */
/* snprintf(buf, INET6_ADDRSTRLEN, "%d.%d.%d.%d", ptr[0], ptr[1], ptr[2], ptr[3]); */ /* snprintf(buf, sizeof(buf), "%d.%d.%d.%d", ptr[0], ptr[1], ptr[2], ptr[3]); */
inet_ntop(addr->sa_family, inet_ntop(addr->sa_family,
(addr->sa_family == AF_INET6 ? (addr->sa_family == AF_INET6 ?
(void*)(&(((struct sockaddr_in6 *)addr)->sin6_addr)) : (void*)(&(((struct sockaddr_in6 *)addr)->sin6_addr)) :

4
lib/chibi/disasm.c
View file

@ -22,13 +22,13 @@
static void sexp_write_pointer (sexp ctx, void *p, sexp out) { static void sexp_write_pointer (sexp ctx, void *p, sexp out) {
char buf[32]; char buf[32];
snprintf(buf, 32, "%p", p); snprintf(buf, sizeof(buf), "%p", p);
sexp_write_string(ctx, buf, out); sexp_write_string(ctx, buf, out);
} }
static void sexp_write_integer (sexp ctx, sexp_sint_t n, sexp out) { static void sexp_write_integer (sexp ctx, sexp_sint_t n, sexp out) {
char buf[32]; char buf[32];
snprintf(buf, 32, SEXP_PRId, n); snprintf(buf, sizeof(buf), SEXP_PRId, n);
sexp_write_string(ctx, buf, out); sexp_write_string(ctx, buf, out);
} }

14
main.c
View file

@ -186,14 +186,12 @@ static sexp_uint_t multiplier (char c) {
#endif #endif
static char* make_import(const char* prefix, const char* mod, const char* suffix) { static char* make_import(const char* prefix, const char* mod, const char* suffix) {
int preflen = strlen(prefix), modlen = strlen(mod); char *impmod, *p;
int len = preflen + modlen + strlen(suffix); size_t impmodsize;
int suflen = strlen(suffix) + (mod[0] == '(' ? 1 : 0); if (mod[0] == '(') mod++;
char *p, *impmod = (char*) malloc(len+1); impmodsize = strlen(prefix) + strlen(mod) + strlen(suffix) + 1;
snprintf(impmod, len, "%s", prefix); impmod = (char*) malloc(impmodsize);
snprintf(impmod+preflen, len-preflen, "%s", mod[0] == '(' ? mod + 1 : mod); snprintf(impmod, impmodsize, "%s%s%s", prefix, mod, suffix);
snprintf(impmod+len-suflen, suflen+1, "%s", suffix);
impmod[len] = '\0';
for (p=impmod; *p; p++) for (p=impmod; *p; p++)
if (*p == '.') *p=' '; if (*p == '.') *p=' ';
return impmod; return impmod;

12
sexp.c
View file

@ -2173,11 +2173,11 @@ sexp sexp_write_one (sexp ctx, sexp obj, sexp out, sexp_sint_t bound) {
} else } else
#endif #endif
{ {
i = snprintf(numbuf, NUMBUF_LEN, "%.15lg", f); i = snprintf(numbuf, sizeof(numbuf), "%.15lg", f);
if (sscanf(numbuf, "%lg", &ftmp) == 1 && ftmp != f) { if (sscanf(numbuf, "%lg", &ftmp) == 1 && ftmp != f) {
i = snprintf(numbuf, NUMBUF_LEN, "%.16lg", f); i = snprintf(numbuf, sizeof(numbuf), "%.16lg", f);
if (sscanf(numbuf, "%lg", &ftmp) == 1 && ftmp != f) { if (sscanf(numbuf, "%lg", &ftmp) == 1 && ftmp != f) {
i = snprintf(numbuf, NUMBUF_LEN, "%.17lg", f); i = snprintf(numbuf, sizeof(numbuf), "%.17lg", f);
} }
} }
if (!strchr(numbuf, '.') && !strchr(numbuf, 'e')) { if (!strchr(numbuf, '.') && !strchr(numbuf, 'e')) {
@ -2310,7 +2310,7 @@ sexp sexp_write_one (sexp ctx, sexp obj, sexp out, sexp_sint_t bound) {
if (i!=0) sexp_write_char(ctx, ' ', out); if (i!=0) sexp_write_char(ctx, ' ', out);
#if SEXP_BYTEVECTOR_HEX_LITERALS #if SEXP_BYTEVECTOR_HEX_LITERALS
if (str[i]) { if (str[i]) {
snprintf(buf, 5, "#x%02hhX", ((unsigned char*) str)[i]); snprintf(buf, sizeof(buf), "#x%02hhX", ((unsigned char*) str)[i]);
sexp_write_string(ctx, buf, out); sexp_write_string(ctx, buf, out);
} else { } else {
sexp_write_char (ctx, '0', out); sexp_write_char (ctx, '0', out);
@ -2365,7 +2365,7 @@ sexp sexp_write_one (sexp ctx, sexp obj, sexp out, sexp_sint_t bound) {
break; break;
} }
} else if (sexp_fixnump(obj)) { } else if (sexp_fixnump(obj)) {
snprintf(numbuf, NUMBUF_LEN, "%" SEXP_PRIdFIXNUM, (sexp_sint_t)sexp_unbox_fixnum(obj)); snprintf(numbuf, sizeof(numbuf), "%" SEXP_PRIdFIXNUM, (sexp_sint_t)sexp_unbox_fixnum(obj));
sexp_write_string(ctx, numbuf, out); sexp_write_string(ctx, numbuf, out);
#if SEXP_USE_IMMEDIATE_FLONUMS #if SEXP_USE_IMMEDIATE_FLONUMS
} else if (sexp_flonump(obj)) { } else if (sexp_flonump(obj)) {
@ -2377,7 +2377,7 @@ sexp sexp_write_one (sexp ctx, sexp obj, sexp out, sexp_sint_t bound) {
} else } else
#endif #endif
{ {
i = snprintf(numbuf, NUMBUF_LEN, "%.8g", f); i = snprintf(numbuf, sizeof(numbuf), "%.8g", f);
if (f == trunc(f) && ! strchr(numbuf, '.')) { if (f == trunc(f) && ! strchr(numbuf, '.')) {
numbuf[i++] = '.'; numbuf[i++] = '0'; numbuf[i++] = '\0'; numbuf[i++] = '.'; numbuf[i++] = '0'; numbuf[i++] = '\0';
} }

2
tools/chibi-ffi
View file

@ -642,7 +642,7 @@
errnos) errnos)
" } " }
snprintf(buf, 64, \"unknown error: %d\", err); snprintf(buf, sizeof(buf), \"unknown error: %d\", err);
return buf; return buf;
}"))))))) }")))))))