From 4346a7b796c056e9e45ddc2433f4ff86b2624be5 Mon Sep 17 00:00:00 2001
From: Per Cederqvist <ceder@lysator.liu.se>
Date: Wed, 10 Jun 1992 12:54:40 +0000
Subject: [PATCH] This commit was generated by cvs2svn to compensate for
changes in r466, which included commits to RCS files with non-trunk default
branches.
---
src/libraries/libisc-new/src/isc_socket.c | 2 +-
src/libraries/libisc-new/src/printf.c | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/libraries/libisc-new/src/isc_socket.c b/src/libraries/libisc-new/src/isc_socket.c
index 680541da4..9285ed8ed 100644
--- a/src/libraries/libisc-new/src/isc_socket.c
+++ b/src/libraries/libisc-new/src/isc_socket.c
@@ -55,7 +55,7 @@ extern int accept(int fd, struct sockaddr *sock, int *len);
#undef inet_ntoa
#endif
-static char *inet_ntoa(ad)
+char *inet_ntoa(ad)
struct in_addr ad;
{
u_long s_ad;
diff --git a/src/libraries/libisc-new/src/printf.c b/src/libraries/libisc-new/src/printf.c
index badac4388..1470f49be 100644
--- a/src/libraries/libisc-new/src/printf.c
+++ b/src/libraries/libisc-new/src/printf.c
@@ -240,9 +240,10 @@ rflag: switch (*++fmt)
* zeroes later, so buffer size stays rational.
*/
if (prec > MAXFRACT) {
- if (*fmt != 'g' && *fmt != 'G' || (flags&ALT))
- fpprec = prec - MAXFRACT;
- prec = MAXFRACT;
+ if ((*fmt != 'g' && *fmt != 'G') ||
+ (flags&ALT))
+ fpprec = prec - MAXFRACT;
+ prec = MAXFRACT;
}
else if (prec == -1)
prec = DEFPREC;
@@ -556,7 +557,7 @@ eformat: if (expcnt) {
* conversion is less than -4 or greater than the precision.''
* -- ANSI X3J11
*/
- if (expcnt > prec || !expcnt && fract && fract < .0001) {
+ if (expcnt > prec || (!expcnt && fract && fract < .0001)) {
/*
* g/G format counts "significant digits, not digits of
* precision; for the e/E format, this just causes an
--
GitLab