Module Name: src
Committed By: roy
Date: Fri Jan 6 09:14:07 UTC 2017
Modified Files:
src/lib/libcurses: color.c cur_hash.c curses.h curses_private.h
refresh.c
Log Message:
u_int -> unsigned int, u_int32_t -> uint32_t.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/lib/libcurses/color.c
cvs rdiff -u -r1.12 -r1.13 src/lib/libcurses/cur_hash.c
cvs rdiff -u -r1.118 -r1.119 src/lib/libcurses/curses.h
cvs rdiff -u -r1.56 -r1.57 src/lib/libcurses/curses_private.h
cvs rdiff -u -r1.81 -r1.82 src/lib/libcurses/refresh.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/color.c
diff -u src/lib/libcurses/color.c:1.39 src/lib/libcurses/color.c:1.40
--- src/lib/libcurses/color.c:1.39 Tue Jan 3 12:39:44 2017
+++ src/lib/libcurses/color.c Fri Jan 6 09:14:07 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: color.c,v 1.39 2017/01/03 12:39:44 roy Exp $ */
+/* $NetBSD: color.c,v 1.40 2017/01/06 09:14:07 roy Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: color.c,v 1.39 2017/01/03 12:39:44 roy Exp $");
+__RCSID("$NetBSD: color.c,v 1.40 2017/01/06 09:14:07 roy Exp $");
#endif /* not lint */
#include "curses.h"
@@ -542,7 +542,7 @@ __set_color( /*ARGSUSED*/ WINDOW *win, a
if ((curscr->wattr & __COLOR) == (attr & __COLOR))
return;
- pair = PAIR_NUMBER((u_int32_t)attr);
+ pair = PAIR_NUMBER((uint32_t)attr);
#ifdef DEBUG
__CTRACE(__CTRACE_COLOR, "__set_color: %d, %d, %d\n", pair,
_cursesi_screen->colour_pairs[pair].fore,
Index: src/lib/libcurses/cur_hash.c
diff -u src/lib/libcurses/cur_hash.c:1.12 src/lib/libcurses/cur_hash.c:1.13
--- src/lib/libcurses/cur_hash.c:1.12 Fri Feb 18 22:16:27 2005
+++ src/lib/libcurses/cur_hash.c Fri Jan 6 09:14:07 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cur_hash.c,v 1.12 2005/02/18 22:16:27 dsl Exp $ */
+/* $NetBSD: cur_hash.c,v 1.13 2017/01/06 09:14:07 roy Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cur_hash.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: cur_hash.c,v 1.12 2005/02/18 22:16:27 dsl Exp $");
+__RCSID("$NetBSD: cur_hash.c,v 1.13 2017/01/06 09:14:07 roy Exp $");
#endif
#endif /* not lint */
@@ -46,10 +46,10 @@ __RCSID("$NetBSD: cur_hash.c,v 1.12 2005
/*
* __hash_more() is "hashpjw" from the Dragon Book, Aho, Sethi & Ullman, p.436.
*/
-u_int
-__hash_more(const void *v_s, size_t len, u_int h)
+unsigned int
+__hash_more(const void *v_s, size_t len, unsigned int h)
{
- u_int g;
+ unsigned int g;
size_t i = 0;
const char *s = v_s;
Index: src/lib/libcurses/curses.h
diff -u src/lib/libcurses/curses.h:1.118 src/lib/libcurses/curses.h:1.119
--- src/lib/libcurses/curses.h:1.118 Thu Jan 5 23:15:43 2017
+++ src/lib/libcurses/curses.h Fri Jan 6 09:14:07 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: curses.h,v 1.118 2017/01/05 23:15:43 roy Exp $ */
+/* $NetBSD: curses.h,v 1.119 2017/01/06 09:14:07 roy Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -395,9 +395,9 @@ __END_DECLS
#define COLOR_WHITE 0x07
#ifdef __cplusplus
-#define __UINT32_CAST(a) static_cast<u_int32_t>(a)
+#define __UINT32_CAST(a) static_cast<uint32_t>(a)
#else
-#define __UINT32_CAST(a) (u_int32_t)(a)
+#define __UINT32_CAST(a) (uint32_t)(a)
#endif
#define COLOR_PAIR(n) (((__UINT32_CAST(n)) << 17) & A_COLOR)
#define PAIR_NUMBER(n) (((__UINT32_CAST(n)) & A_COLOR) >> 17)
Index: src/lib/libcurses/curses_private.h
diff -u src/lib/libcurses/curses_private.h:1.56 src/lib/libcurses/curses_private.h:1.57
--- src/lib/libcurses/curses_private.h:1.56 Thu Jan 5 20:31:37 2017
+++ src/lib/libcurses/curses_private.h Fri Jan 6 09:14:07 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: curses_private.h,v 1.56 2017/01/05 20:31:37 roy Exp $ */
+/* $NetBSD: curses_private.h,v 1.57 2017/01/06 09:14:07 roy Exp $ */
/*-
* Copyright (c) 1998-2000 Brett Lymn
@@ -313,7 +313,7 @@ void _cursesi_reset_wacs(SCREEN *);
void _cursesi_resetterm(SCREEN *);
int _cursesi_setterm(char *, SCREEN *);
int __delay(void);
-u_int __hash_more(const void *, size_t, u_int);
+unsigned int __hash_more(const void *, size_t, unsigned int);
#define __hash(s, len) __hash_more((s), (len), 0u)
void __id_subwins(WINDOW *);
void __init_getch(SCREEN *);
Index: src/lib/libcurses/refresh.c
diff -u src/lib/libcurses/refresh.c:1.81 src/lib/libcurses/refresh.c:1.82
--- src/lib/libcurses/refresh.c:1.81 Sat Dec 31 22:47:01 2016
+++ src/lib/libcurses/refresh.c Fri Jan 6 09:14:07 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: refresh.c,v 1.81 2016/12/31 22:47:01 roy Exp $ */
+/* $NetBSD: refresh.c,v 1.82 2017/01/06 09:14:07 roy Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)refresh.c 8.7 (Berkeley) 8/13/94";
#else
-__RCSID("$NetBSD: refresh.c,v 1.81 2016/12/31 22:47:01 roy Exp $");
+__RCSID("$NetBSD: refresh.c,v 1.82 2017/01/06 09:14:07 roy Exp $");
#endif
#endif /* not lint */
@@ -1342,7 +1342,7 @@ domvcur(oy, ox, ny, nx)
*/
static __LDATA buf[128];
-static u_int last_hash;
+static unsigned int last_hash;
static size_t last_hash_len;
#define BLANKSIZE (sizeof(buf) / sizeof(buf[0]))
@@ -1354,7 +1354,7 @@ quickch(void)
__LINE *clp, *tmp1, *tmp2;
int bsize, curs, curw, starts, startw, i, j;
int n, target, cur_period, bot, top, sc_region;
- u_int blank_hash;
+ unsigned int blank_hash;
attr_t bcolor;
#ifdef __GNUC__
