X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/9899d01a0ccec166e04caa60657a44e614be50cd..d48cd3f48fdd0d67f906311b632fb58ae4765b5e:/lib-src/ebrowse.c
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index ea230a9c3c..b51b4aa696 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -1,24 +1,24 @@
/* ebrowse.c --- parsing files for the ebrowse C++ browser
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+ 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ Free Software Foundation, Inc.
- This file is part of GNU Emacs.
+This file is part of GNU Emacs.
- GNU Emacs is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3, or (at your option)
- any later version.
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
- GNU Emacs is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs. If not, see . */
- You should have received a copy of the GNU General Public License
- along with GNU Emacs; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
#include
@@ -589,17 +589,6 @@ xrealloc (p, sz)
}
-/* Like free but always check for null pointers.. */
-
-void
-xfree (p)
- void *p;
-{
- if (p)
- free (p);
-}
-
-
/* Like strdup, but print an error and exit if not enough memory is
available.. If S is null, return null. */
@@ -2044,7 +2033,7 @@ matching_regexp ()
while (in - p < min_regexp && p > inbuffer)
{
/* Line probably not significant enough */
- for (--p; p >= inbuffer && *p != '\n'; --p)
+ for (--p; p > inbuffer && *p != '\n'; --p)
;
}
if (*p == '\n')
@@ -2759,7 +2748,7 @@ member (cls, vis)
if (LOOKING_AT ('{') && id && cls)
add_member_defn (cls, id, regexp, pos, hash, 0, sc, flags);
- xfree (id);
+ free (id);
id = NULL;
sc = SC_MEMBER;
break;
@@ -2838,7 +2827,7 @@ member (cls, vis)
print_info ();
}
- xfree (id);
+ free (id);
}
@@ -3075,7 +3064,7 @@ parse_qualified_ident_or_type (last_id)
cls = add_sym (id, cls);
*last_id = NULL;
- xfree (id);
+ free (id);
id = NULL;
id_size = 0;
MATCH ();
@@ -3278,7 +3267,7 @@ add_declarator (cls, id, flags, sc)
print_info ();
}
- xfree (*id);
+ free (*id);
*id = NULL;
*cls = NULL;
}
@@ -3331,7 +3320,7 @@ declaration (flags)
`declare (X, Y)\n class A : ...'. */
if (id)
{
- xfree (id);
+ free (id);
return;
}
@@ -3425,7 +3414,7 @@ declaration (flags)
if (!cls && id && LOOKING_AT ('{'))
add_global_defn (id, regexp, pos, hash, 0, sc, flags);
- xfree (id);
+ free (id);
id = NULL;
break;
}
@@ -3481,7 +3470,7 @@ globals (start_flags)
MATCH_IF ('}');
}
- xfree (namespace_name);
+ free (namespace_name);
}
}
break;
@@ -3690,8 +3679,11 @@ usage (error)
void
version ()
{
+ /* Makes it easier to update automatically. */
+ char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc.";
+
printf ("ebrowse %s\n", VERSION);
- puts ("Copyright (C) 1992-2007 Free Software Foundation, Inc.");
+ puts (emacs_copyright);
puts ("This program is distributed under the same terms as Emacs.");
exit (EXIT_SUCCESS);
}