File Term-ReadLine-Gnu-1.20.dif of Package perl-TermReadLine-Gnu
--- Gnu.xs
+++ Gnu.xs 2008/01/26 21:40:21
@@ -25,6 +25,7 @@
#ifdef __CYGWIN__
#include <sys/termios.h>
#endif /* __CYGWIN__ */
+
#include <readline/readline.h>
#include <readline/history.h>
@@ -249,18 +250,14 @@
extern PTR_T xfree PARAMS((PTR_T));
#else /* not OS2_USEDLL */
-static void
-xfree (string)
- PTR_T string;
+static void xfree (PTR_T string)
{
if (string)
free (string);
}
#endif /* not OS2_USEDLL */
-static char *
-dupstr(s) /* duplicate string */
- CONST char * s;
+static char* dupstr(CONST char* s)
{
/*
* Use xmalloc(), because allocated block will be freed in the GNU
@@ -290,8 +287,7 @@
* did not, since he could not find any reasonable excuse.
*/
static const char *
-rl_get_function_name (function)
- rl_command_func_t *function;
+rl_get_function_name (rl_command_func_t * function)
{
register int i;
@@ -558,8 +554,7 @@
* for rl_voidfunc_t : void fn(void)
*/
static int
-voidfunc_wrapper(type)
- int type;
+voidfunc_wrapper(int type)
{
dSP;
int count;
@@ -588,9 +583,7 @@
* for rl_vintfunc_t : void fn(int)
*/
static int
-vintfunc_wrapper(type, arg)
- int type;
- int arg;
+vintfunc_wrapper(int type, int arg)
{
dSP;
int count;
@@ -621,9 +614,7 @@
* for rl_icppfunc_t : int fn(char **)
*/
static int
-icppfunc_wrapper(type, arg)
- int type;
- char **arg;
+icppfunc_wrapper(int type, char** arg)
{
dSP;
int count;
@@ -671,9 +662,7 @@
* for rl_icpfunc_t : int fn(char *)
*/
static int
-icpfunc_wrapper(type, text)
- int type;
- char *text;
+icpfunc_wrapper(int type, char* text)
{
dSP;
int count;
@@ -709,8 +698,7 @@
* for rl_cpvfunc_t : (char *)fn(void)
*/
static char *
-cpvfunc_wrapper(type)
- int type;
+cpvfunc_wrapper(int type)
{
dSP;
int count;
@@ -739,10 +727,7 @@
* for rl_linebuf_func_t : int fn(char *, int)
*/
static int
-icpintfunc_wrapper(type, text, index)
- int type;
- char *text;
- int index;
+icpintfunc_wrapper(int type, char* text, int index)
{
dSP;
int count;
@@ -780,8 +765,7 @@
event_hook_wrapper() { return voidfunc_wrapper(EVENT_HOOK); }
static int
-getc_function_wrapper(fp)
- PerlIO *fp;
+getc_function_wrapper(PerlIO* fp)
{
/*
* 'PerlIO *fp' is ignored. Use rl_instream instead in the getc_function.
@@ -799,9 +783,7 @@
*/
static char *
-completion_entry_function_wrapper(text, state)
- const char *text;
- int state;
+completion_entry_function_wrapper(const char* text, int state)
{
dSP;
int count;
@@ -842,10 +824,7 @@
*/
static char **
-attempted_completion_function_wrapper(text, start, end)
- char *text;
- int start;
- int end;
+attempted_completion_function_wrapper(char* text, int start, int end)
{
dSP;
int count;
@@ -928,10 +907,7 @@
*/
static char *
-filename_quoting_function_wrapper(text, match_type, quote_pointer)
- char *text;
- int match_type;
- char *quote_pointer;
+filename_quoting_function_wrapper(char* text, int match_type, char* quote_pointer)
{
dSP;
int count;
@@ -977,9 +953,7 @@
*/
static char *
-filename_dequoting_function_wrapper(text, quote_char)
- char *text;
- int quote_char;
+filename_dequoting_function_wrapper(char* text, int quote_char)
{
dSP;
int count;
@@ -1019,9 +993,7 @@
*/
static int
-char_is_quoted_p_wrapper(text, index)
- char *text;
- int index;
+char_is_quoted_p_wrapper(char* text, int index)
{
return icpintfunc_wrapper(CHAR_IS_QUOTEDP, text, index);
}
@@ -1032,8 +1004,7 @@
*/
static void
-ignore_some_completions_function_wrapper(matches)
- char **matches;
+ignore_some_completions_function_wrapper(char** matches)
{
dSP;
int count, i, only_one_match;
@@ -1119,8 +1090,7 @@
*/
static int
-directory_completion_hook_wrapper(textp)
- char **textp;
+directory_completion_hook_wrapper(char** textp)
{
return icppfunc_wrapper(DIR_COMP, textp);
}
@@ -1130,9 +1100,7 @@
*/
static int
-history_inhibit_expansion_function_wrapper(text, index)
- char *text;
- int index;
+history_inhibit_expansion_function_wrapper(char* text, int index)
{
return icpintfunc_wrapper(HIST_INHIBIT_EXP, text, index);
}
@@ -1147,10 +1115,7 @@
*/
static void
-completion_display_matches_hook_wrapper(matches, len, max)
- char **matches;
- int len;
- int max;
+completion_display_matches_hook_wrapper(char** matches, int len, int max)
{
dSP;
int i;
@@ -1184,10 +1149,7 @@
}
#else /* (RL_VERSION_MAJOR < 4) */
static void
-completion_display_matches_hook_wrapper(matches, len, max)
- char **matches;
- int len;
- int max;
+completion_display_matches_hook_wrapper(char** matches, int len, int max)
{
/* dummy */
}
@@ -1200,8 +1162,7 @@
}
static int
-prep_term_function_wrapper(meta_flag)
- int meta_flag;
+prep_term_function_wrapper(int meta_flag)
{
return vintfunc_wrapper(PREP_TERM, meta_flag);
}
@@ -1213,8 +1174,7 @@
* call a perl function as rl_directory_completion_hook
*/
static int
-directory_rewrite_hook_wrapper(dirname)
- char **dirname;
+directory_rewrite_hook_wrapper(char** dirname)
{
return icppfunc_wrapper(DIR_REWRITE, dirname);
}
@@ -1587,8 +1547,7 @@
# Do not free the string returned.
const char *
-rl_get_function_name(function)
- rl_command_func_t * function
+rl_get_function_name(rl_command_func_t* function)
PROTOTYPE: $
void
@@ -1782,9 +1741,7 @@
int i
PROTOTYPE: $
-int
-_rl_message(text)
- const char * text
+int _rl_message(const char* text)
PROTOTYPE: $
CODE:
RETVAL = rl_message(text);
--- ./Gnu/XS.pm.orig 2004-10-17 17:03:20.000000000 +0000
+++ ./Gnu/XS.pm 2005-11-28 17:11:23.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# XS.pm : perl function definition for Term::ReadLine::Gnu
#
--- ./eg/fileman.orig 1998-02-28 10:01:34.000000000 +0000
+++ ./eg/fileman 2005-11-28 17:11:23.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# $Id: fileman,v 1.1 1998-02-28 19:01:24+09 hayashi Exp $
#
--- ./eg/perlsh.orig 2002-06-14 05:41:13.000000000 +0000
+++ ./eg/perlsh 2005-11-28 17:11:23.000000000 +0000
@@ -1,4 +1,4 @@
-#! /usr/local/bin/perl
+#!/usr/bin/perl
#
# $Id: perlsh,v 1.24 2001-10-27 22:59:15-05 hayashi Exp $
#
--- ./eg/pftp.orig 1999-03-19 17:46:02.000000000 +0000
+++ ./eg/pftp 2005-11-28 17:11:23.000000000 +0000
@@ -1,4 +1,4 @@
-#! /usr/local/bin/perl
+#!/usr/bin/perl
#
# $Id: pftp,v 1.9 1999-03-20 02:46:02+09 hayashi Exp $
#
--- ./eg/ptksh+.orig 1999-03-14 16:43:20.000000000 +0000
+++ ./eg/ptksh+ 2005-11-28 17:11:23.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl -w
#
# $Id: ptksh+,v 1.5 1997/04/01 17:15:34 ach Exp ach $
#
--- ./ppport.h.orig 1999-03-27 01:18:14.000000000 +0000
+++ ./ppport.h 2005-11-28 17:11:23.000000000 +0000
@@ -40,7 +40,7 @@
special defines should be used, ppport.h can be run through Perl to check
your source code. Simply say:
- perl -x ppport.h *.c *.h *.xs foo/*.c [etc]
+ perl -x ppport.h *.c *.h *.xs foo/foo.c [etc]
The result will be a list of patches suggesting changes that should at
least be acceptable, if not necessarily the most efficient solution, or a
