56 lines
1.2 KiB
Text
56 lines
1.2 KiB
Text
$NetBSD: patch-aa,v 1.3 2007/07/04 21:53:34 joerg Exp $
|
|
|
|
--- unvis/libunvis.c.orig 2006-01-25 14:33:51.000000000 +0000
|
|
+++ unvis/libunvis.c
|
|
@@ -40,11 +40,6 @@
|
|
#endif
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
-#ifdef notdef
|
|
-#define __LIBC12_SOURCE__
|
|
-
|
|
-#include "namespace.h"
|
|
-#endif
|
|
#include <sys/types.h>
|
|
|
|
#include <assert.h>
|
|
@@ -52,20 +47,11 @@
|
|
#include <stdio.h>
|
|
#include <vis.h>
|
|
|
|
-#ifdef __weak_alias
|
|
-__weak_alias(strunvis,_strunvis)
|
|
-__weak_alias(unvis,_unvis)
|
|
-#endif
|
|
#ifndef _DIAGASSERT
|
|
#define _DIAGASSERT(a)
|
|
#endif
|
|
|
|
-#ifdef __warn_references
|
|
-__warn_references(unvis,
|
|
- "warning: reference to compatibility unvis(); include <vis.h> for correct reference")
|
|
-#endif
|
|
-
|
|
-#if !HAVE_VIS
|
|
+#ifndef HAVE_VIS
|
|
/*
|
|
* decode driven by state machine
|
|
*/
|
|
@@ -82,6 +68,8 @@ __warn_references(unvis,
|
|
#define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
|
|
#define xtod(c) (isdigit(c) ? (c - '0') : ((tolower(c) - 'a') + 10))
|
|
|
|
+static int __unvis13(char *cp, int c, int *astate, int flag);
|
|
+
|
|
int
|
|
unvis(cp, c, astate, flag)
|
|
char *cp;
|
|
@@ -94,7 +82,7 @@ unvis(cp, c, astate, flag)
|
|
/*
|
|
* unvis - decode characters previously encoded by vis
|
|
*/
|
|
-int
|
|
+static int
|
|
__unvis13(cp, c, astate, flag)
|
|
char *cp;
|
|
int c;
|