[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/info echo-area.c filesys.c footnotes.c ...
|
From: |
Sergey Poznyakoff |
|
Subject: |
texinfo/info echo-area.c filesys.c footnotes.c ... |
|
Date: |
Thu, 28 Jul 2011 07:14:06 +0000 |
CVSROOT: /cvsroot/texinfo
Module name: texinfo
Changes by: Sergey Poznyakoff <gray> 11/07/28 07:14:06
Modified files:
info : echo-area.c filesys.c footnotes.c info.c
infomap.c m-x.c nodemenu.c search.c variables.c
window.c
Log message:
Remove extra arguments from calls to variadic functions.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/echo-area.c?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/filesys.c?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/footnotes.c?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/info.c?cvsroot=texinfo&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/infomap.c?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/m-x.c?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/nodemenu.c?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/search.c?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/variables.c?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/window.c?cvsroot=texinfo&r1=1.22&r2=1.23
Patches:
Index: echo-area.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/echo-area.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- echo-area.c 16 Feb 2011 21:31:06 -0000 1.15
+++ echo-area.c 28 Jul 2011 07:14:05 -0000 1.16
@@ -1,5 +1,5 @@
/* echo-area.c -- how to read a line in the echo area.
- $Id: echo-area.c,v 1.15 2011/02/16 21:31:06 gray Exp $
+ $Id: echo-area.c,v 1.16 2011/07/28 07:14:05 gray Exp $
Copyright (C) 1993, 1997, 1998, 1999, 2001, 2004, 2007, 2008
Free Software Foundation, Inc.
@@ -937,11 +937,10 @@
int limit, iterations, max_label = 0;
initialize_message_buffer ();
- printf_to_message_buffer (completions_found_index == 1
- ? _("One completion:\n")
- : _("%d completions:\n"),
- (void *) (long) completions_found_index,
- NULL, NULL);
+ printf_to_message_buffer (ngettext ("%d completion:\n",
+ "%d completions:\n",
+ completions_found_index),
+ completions_found_index);
/* Find the maximum length of a label. */
for (i = 0; i < completions_found_index; i++)
@@ -987,17 +986,17 @@
label = completions_found[l]->label;
printed_length = strlen (label);
- printf_to_message_buffer ("%s", label, NULL, NULL);
+ printf_to_message_buffer ("%s", label);
if (j + 1 < limit)
{
for (k = 0; k < max_label - printed_length; k++)
- printf_to_message_buffer (" ", NULL, NULL, NULL);
+ printf_to_message_buffer (" ");
}
}
l += iterations;
}
- printf_to_message_buffer ("\n", NULL, NULL, NULL);
+ printf_to_message_buffer ("\n");
}
/* Make a new node to hold onto possible completions. Don't destroy
@@ -1221,8 +1220,7 @@
if (!informed_of_lengthy_job && completions_found_index > 100)
{
informed_of_lengthy_job = 1;
- window_message_in_echo_area (_("Building completions..."),
- NULL, NULL);
+ window_message_in_echo_area (_("Building completions..."));
}
}
Index: filesys.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/filesys.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- filesys.c 25 Oct 2009 18:29:00 -0000 1.15
+++ filesys.c 28 Jul 2011 07:14:05 -0000 1.16
@@ -1,5 +1,5 @@
/* filesys.c -- filesystem specific functions.
- $Id: filesys.c,v 1.15 2009/10/25 18:29:00 karl Exp $
+ $Id: filesys.c,v 1.16 2011/07/28 07:14:05 gray Exp $
Copyright 1993, 1997, 1998, 2000, 2002, 2003, 2004, 2007, 2008, 2009
Free Software Foundation, Inc.
@@ -684,7 +684,7 @@
temp = xmalloc (5 + strlen (command));
sprintf (temp, "%s...", command);
- message_in_echo_area ("%s", temp, NULL);
+ message_in_echo_area ("%s", temp);
free (temp);
}
#endif /* !BUILDING_LIBRARY */
Index: footnotes.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/footnotes.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- footnotes.c 11 Jun 2008 09:55:42 -0000 1.9
+++ footnotes.c 28 Jul 2011 07:14:05 -0000 1.10
@@ -1,5 +1,5 @@
/* footnotes.c -- Some functions for manipulating footnotes.
- $Id: footnotes.c,v 1.9 2008/06/11 09:55:42 gray Exp $
+ $Id: footnotes.c,v 1.10 2011/07/28 07:14:05 gray Exp $
Copyright (C) 1993, 1997, 1998, 1999, 2002, 2004, 2007,
2008 Free Software Foundation, Inc.
@@ -256,11 +256,11 @@
switch (result)
{
case FN_UNFOUND:
- info_error (msg_no_foot_node, NULL, NULL);
+ info_error (msg_no_foot_node);
break;
case FN_UNABLE:
- info_error (msg_win_too_small, NULL, NULL);
+ info_error (msg_win_too_small);
break;
}
}
Index: info.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/info.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- info.c 6 Apr 2011 21:16:12 -0000 1.36
+++ info.c 28 Jul 2011 07:14:05 -0000 1.37
@@ -1,5 +1,5 @@
/* info.c -- Display nodes of Info files in multiple windows.
- $Id: info.c,v 1.36 2011/04/06 21:16:12 gray Exp $
+ $Id: info.c,v 1.37 2011/07/28 07:14:05 gray Exp $
Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
2004, 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
@@ -369,10 +369,10 @@
if (!initial_node)
{
if (info_recent_file_error)
- info_error (info_recent_file_error, NULL, NULL);
+ info_error ("%s", info_recent_file_error);
else
info_error (msg_cant_find_node,
- user_nodenames ? user_nodenames[0] : "Top", NULL);
+ user_nodenames ? user_nodenames[0] : "Top");
xexit (1);
}
Index: infomap.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/infomap.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- infomap.c 11 Jun 2008 09:55:42 -0000 1.21
+++ infomap.c 28 Jul 2011 07:14:05 -0000 1.22
@@ -1,5 +1,5 @@
/* infomap.c -- keymaps for Info.
- $Id: infomap.c,v 1.21 2008/06/11 09:55:42 gray Exp $
+ $Id: infomap.c,v 1.22 2011/07/28 07:14:05 gray Exp $
Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008
Free Software Foundation, Inc.
@@ -937,8 +937,7 @@
{
if (filename && errno != ENOENT)
{
- info_error(filesys_error_string(filename, errno),
- NULL, NULL);
+ info_error(filesys_error_string(filename, errno));
free(filename);
}
return 0;
@@ -953,10 +952,10 @@
more than 100 KB is a problem). */
if (len < INFOKEY_NMAGIC + 2)
info_error(_("Ignoring invalid infokey file `%s' - too
small"),
- filename, NULL);
+ filename);
else
info_error(_("Ignoring invalid infokey file `%s' - too
big"),
- filename, NULL);
+ filename);
close(f);
free(filename);
return 0;
@@ -969,7 +968,7 @@
if ((unsigned int) nread != len)
{
info_error(_("Error reading infokey file `%s' - short read"),
- filename, NULL);
+ filename);
free(buf);
free(filename);
return 0;
@@ -988,7 +987,7 @@
)
{
info_error(_("Invalid infokey file `%s' (bad magic numbers) --
run infokey to update it"),
- filename, NULL);
+ filename);
free(filename);
return 0;
}
@@ -997,7 +996,7 @@
{
info_error
(_("Your infokey file `%s' is out of date -- run infokey to
update it"),
- filename, NULL);
+ filename);
free(filename);
return 0;
}
@@ -1013,7 +1012,7 @@
if (n < 0 || (unsigned int) n > len - 4 - (p - buf))
{
info_error(_("Invalid infokey file `%s' (bad section
length) -- run infokey to update it"),
- filename, NULL);
+ filename);
free(filename);
return 0;
}
@@ -1034,7 +1033,7 @@
break;
default:
info_error(_("Invalid infokey file `%s' (bad section
code) -- run infokey to update it"),
- filename, NULL);
+ filename);
free(filename);
return 0;
}
@@ -1168,8 +1167,7 @@
}
}
if (state != getseq)
- info_error(_("Bad data in infokey file -- some key bindings
ignored"),
- NULL, NULL);
+ info_error(_("Bad data in infokey file -- some key bindings
ignored"));
return !stop;
}
@@ -1218,8 +1216,7 @@
}
}
if (state != getvar)
- info_error(_("Bad data in infokey file -- some var settings ignored"),
- NULL, NULL);
+ info_error(_("Bad data in infokey file -- some var settings ignored"));
}
void
Index: m-x.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/m-x.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- m-x.c 11 Jun 2008 09:55:42 -0000 1.8
+++ m-x.c 28 Jul 2011 07:14:05 -0000 1.9
@@ -1,5 +1,5 @@
/* m-x.c -- Meta-x minibuffer reader.
- $Id: m-x.c,v 1.8 2008/06/11 09:55:42 gray Exp $
+ $Id: m-x.c,v 1.9 2011/07/28 07:14:05 gray Exp $
Copyright (C) 1993, 1997, 1998, 2001, 2002, 2004, 2007, 2008
Free Software Foundation, Inc.
@@ -136,8 +136,7 @@
(strncmp (line, "echo-area-", 10) == 0))
{
free (line);
- info_error (_("Cannot execute an `echo-area' command here."),
- NULL, NULL);
+ info_error (_("Cannot execute an `echo-area' command here."));
return;
}
@@ -150,7 +149,7 @@
if (InfoFunction(command))
(*InfoFunction(command)) (active_window, count, 0);
else
- info_error (_("Undefined command: %s"), line, NULL);
+ info_error (_("Undefined command: %s"), line);
}
}
Index: nodemenu.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/nodemenu.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- nodemenu.c 11 Jun 2008 09:55:42 -0000 1.11
+++ nodemenu.c 28 Jul 2011 07:14:05 -0000 1.12
@@ -1,5 +1,5 @@
/* nodemenu.c -- produce a menu of all visited nodes.
- $Id: nodemenu.c,v 1.11 2008/06/11 09:55:42 gray Exp $
+ $Id: nodemenu.c,v 1.12 2011/07/28 07:14:05 gray Exp $
Copyright (C) 1993, 1997, 1998, 2002, 2003, 2004, 2007, 2008
Free Software Foundation, Inc.
@@ -199,15 +199,13 @@
printf_to_message_buffer
("%s", replace_in_documentation
(_("Here is the menu of nodes you have recently visited.\n\
-Select one from this menu, or use `\\[history-node]' in another window.\n"),
0),
- NULL, NULL);
+Select one from this menu, or use `\\[history-node]' in another window.\n"),
0));
- printf_to_message_buffer ("%s\n", (char *) nodemenu_format_info (),
- NULL, NULL);
+ printf_to_message_buffer ("%s\n", nodemenu_format_info ());
for (i = 0; (lines != NULL) && (i < lines_index); i++)
{
- printf_to_message_buffer ("%s\n", lines[i], NULL, NULL);
+ printf_to_message_buffer ("%s\n", lines[i]);
free (lines[i]);
}
@@ -333,7 +331,7 @@
entry = info_get_labeled_reference (line, menu);
if (!entry)
- info_error (_("The reference disappeared! (%s)."), line, NULL);
+ info_error (_("The reference disappeared! (%s)."), line);
else
info_select_reference (window, entry);
}
Index: search.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/search.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- search.c 10 Feb 2011 09:15:11 -0000 1.11
+++ search.c 28 Jul 2011 07:14:05 -0000 1.12
@@ -1,5 +1,5 @@
/* search.c -- searching large bodies of text.
- $Id: search.c,v 1.11 2011/02/10 09:15:11 gray Exp $
+ $Id: search.c,v 1.12 2011/07/28 07:14:05 gray Exp $
Copyright (C) 1993, 1997, 1998, 2002, 2004, 2007, 2008, 2009
Free Software Foundation, Inc.
@@ -163,7 +163,7 @@
int size = regerror (result, &preg, NULL, 0);
char *buf = xmalloc (size);
regerror (result, &preg, buf, size);
- info_error (_("regexp error: %s"), buf, NULL);
+ info_error (_("regexp error: %s"), buf);
return search_failure;
}
Index: variables.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/variables.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- variables.c 11 Jun 2008 09:55:43 -0000 1.10
+++ variables.c 28 Jul 2011 07:14:06 -0000 1.11
@@ -1,5 +1,5 @@
/* variables.c -- how to manipulate user visible variables in Info.
- $Id: variables.c,v 1.10 2008/06/11 09:55:43 gray Exp $
+ $Id: variables.c,v 1.11 2011/07/28 07:14:06 gray Exp $
Copyright (C) 1993, 1997, 2001, 2002, 2004, 2007, 2008
Free Software Foundation, Inc.
@@ -106,7 +106,7 @@
sprintf (description, "%s (%d): %s.",
var->name, *(var->value), _(var->doc));
- window_message_in_echo_area ("%s", description, NULL);
+ window_message_in_echo_area ("%s", description);
free (description);
}
Index: window.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/window.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- window.c 6 Apr 2011 21:19:02 -0000 1.22
+++ window.c 28 Jul 2011 07:14:06 -0000 1.23
@@ -1,5 +1,5 @@
/* window.c -- windows in Info.
- $Id: window.c,v 1.22 2011/04/06 21:19:02 gray Exp $
+ $Id: window.c,v 1.23 2011/07/28 07:14:06 gray Exp $
Copyright (C) 1993, 1997, 1998, 2001, 2002, 2003, 2004, 2007, 2008, 2011
Free Software Foundation, Inc.
@@ -1233,7 +1233,6 @@
!memchr (message_buffer + message_buffer_index, '\0',
message_buffer_size - message_buffer_index + 1))
{
- char *newbuf;
size_t newlen = message_buffer_size * 2;
if (newlen < message_buffer_size)
xalloc_die ();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/info echo-area.c filesys.c footnotes.c ...,
Sergey Poznyakoff <=