[Midnightbsd-cvs] src [10558] trunk/lib/libc/stdio: tag.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Jun 7 20:56:58 EDT 2018
Revision: 10558
http://svnweb.midnightbsd.org/src/?rev=10558
Author: laffer1
Date: 2018-06-07 20:56:56 -0400 (Thu, 07 Jun 2018)
Log Message:
-----------
tag.
Modified Paths:
--------------
trunk/lib/libc/stdio/xprintf.c
trunk/lib/libc/stdio/xprintf_errno.c
trunk/lib/libc/stdio/xprintf_float.c
trunk/lib/libc/stdio/xprintf_hexdump.c
trunk/lib/libc/stdio/xprintf_int.c
trunk/lib/libc/stdio/xprintf_quote.c
trunk/lib/libc/stdio/xprintf_str.c
trunk/lib/libc/stdio/xprintf_time.c
trunk/lib/libc/stdio/xprintf_vis.c
Modified: trunk/lib/libc/stdio/xprintf.c
===================================================================
--- trunk/lib/libc/stdio/xprintf.c 2018-06-08 00:55:38 UTC (rev 10557)
+++ trunk/lib/libc/stdio/xprintf.c 2018-06-08 00:56:56 UTC (rev 10558)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2005 Poul-Henning Kamp
* Copyright (c) 1990, 1993
@@ -30,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/lib/libc/stdio/xprintf.c 238111 2012-07-04 17:35:07Z pjd $
*/
#include "namespace.h"
@@ -651,7 +652,7 @@
}
int
-register_printf_render_std(const unsigned char *specs)
+register_printf_render_std(const char *specs)
{
for (; *specs != '\0'; specs++) {
Modified: trunk/lib/libc/stdio/xprintf_errno.c
===================================================================
--- trunk/lib/libc/stdio/xprintf_errno.c 2018-06-08 00:55:38 UTC (rev 10557)
+++ trunk/lib/libc/stdio/xprintf_errno.c 2018-06-08 00:56:56 UTC (rev 10558)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2005 Poul-Henning Kamp
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/lib/libc/stdio/xprintf_errno.c 255108 2013-08-31 22:32:42Z jilles $
*/
#include <namespace.h>
@@ -34,6 +35,7 @@
#include <vis.h>
#include <assert.h>
#include <sys/time.h>
+#include "errlst.h"
#include "printf.h"
int
@@ -54,7 +56,7 @@
ret = 0;
error = *((const int *)arg[0]);
- if (error >= 0 && error < sys_nerr) {
+ if (error >= 0 && error < __hidden_sys_nerr) {
p = strerror(error);
return (__printf_out(io, pi, p, strlen(p)));
}
Modified: trunk/lib/libc/stdio/xprintf_float.c
===================================================================
--- trunk/lib/libc/stdio/xprintf_float.c 2018-06-08 00:55:38 UTC (rev 10557)
+++ trunk/lib/libc/stdio/xprintf_float.c 2018-06-08 00:56:56 UTC (rev 10558)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2005 Poul-Henning Kamp
* Copyright (c) 1990, 1993
@@ -30,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/lib/libc/stdio/xprintf_float.c 291573 2015-12-01 07:32:35Z ngie $
*/
#include <namespace.h>
@@ -168,7 +169,6 @@
int realsz; /* field size expanded by dprec, sign, etc */
int dprec; /* a copy of prec if [diouxX], 0 otherwise */
char ox[2]; /* space for 0x; ox[1] is either x, X, or \0 */
- int prsize; /* max size of printed field */
int ret; /* return value accumulator */
char *decimal_point; /* locale specific decimal point */
int n2; /* XXX: for PRINTANDPAD */
@@ -344,8 +344,6 @@
if (ox[1])
realsz += 2;
- prsize = pi->width > realsz ? pi->width : realsz;
-
/* right-adjusting blank padding */
if (pi->pad != '0' && pi->left == 0)
ret += __printf_pad(io, pi->width - realsz, 0);
Modified: trunk/lib/libc/stdio/xprintf_hexdump.c
===================================================================
--- trunk/lib/libc/stdio/xprintf_hexdump.c 2018-06-08 00:55:38 UTC (rev 10557)
+++ trunk/lib/libc/stdio/xprintf_hexdump.c 2018-06-08 00:56:56 UTC (rev 10558)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2005 Poul-Henning Kamp
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/lib/libc/stdio/xprintf_hexdump.c 153486 2005-12-16 18:56:39Z phk $
*/
#include <namespace.h>
Modified: trunk/lib/libc/stdio/xprintf_int.c
===================================================================
--- trunk/lib/libc/stdio/xprintf_int.c 2018-06-08 00:55:38 UTC (rev 10557)
+++ trunk/lib/libc/stdio/xprintf_int.c 2018-06-08 00:56:56 UTC (rev 10558)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2005 Poul-Henning Kamp
* Copyright (c) 1990, 1993
@@ -30,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/lib/libc/stdio/xprintf_int.c 330097 2018-02-28 02:49:48Z pfg $
*/
#include <namespace.h>
@@ -258,8 +259,8 @@
const union arg *argp;
char buf[BUF];
char *p, *pe;
- char ns, l;
- int rdx, sign, zext, ngrp;
+ char ns;
+ int l, ngrp, rdx, sign, zext;
const char *nalt, *digit;
char thousands_sep; /* locale specific thousands separator */
const char *grouping; /* locale specific numeric grouping rules */
Modified: trunk/lib/libc/stdio/xprintf_quote.c
===================================================================
--- trunk/lib/libc/stdio/xprintf_quote.c 2018-06-08 00:55:38 UTC (rev 10557)
+++ trunk/lib/libc/stdio/xprintf_quote.c 2018-06-08 00:56:56 UTC (rev 10558)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2005 Poul-Henning Kamp
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/lib/libc/stdio/xprintf_quote.c 156207 2006-03-02 08:53:45Z phk $
*/
#include <namespace.h>
Modified: trunk/lib/libc/stdio/xprintf_str.c
===================================================================
--- trunk/lib/libc/stdio/xprintf_str.c 2018-06-08 00:55:38 UTC (rev 10557)
+++ trunk/lib/libc/stdio/xprintf_str.c 2018-06-08 00:56:56 UTC (rev 10558)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2005 Poul-Henning Kamp
* Copyright (c) 1990, 1993
@@ -30,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/lib/libc/stdio/xprintf_str.c 153486 2005-12-16 18:56:39Z phk $
*/
#include <namespace.h>
Modified: trunk/lib/libc/stdio/xprintf_time.c
===================================================================
--- trunk/lib/libc/stdio/xprintf_time.c 2018-06-08 00:55:38 UTC (rev 10557)
+++ trunk/lib/libc/stdio/xprintf_time.c 2018-06-08 00:56:56 UTC (rev 10558)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2005 Poul-Henning Kamp
* Copyright (c) 1990, 1993
@@ -30,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/lib/libc/stdio/xprintf_time.c 219346 2011-03-06 19:47:46Z pjd $
*/
#include <namespace.h>
#include <stdio.h>
Modified: trunk/lib/libc/stdio/xprintf_vis.c
===================================================================
--- trunk/lib/libc/stdio/xprintf_vis.c 2018-06-08 00:55:38 UTC (rev 10557)
+++ trunk/lib/libc/stdio/xprintf_vis.c 2018-06-08 00:56:56 UTC (rev 10558)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2005 Poul-Henning Kamp
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/lib/libc/stdio/xprintf_vis.c 154815 2006-01-25 12:45:24Z phk $
*/
#include <namespace.h>
More information about the Midnightbsd-cvs
mailing list