Commit 292a29b6 authored by Darin Adler's avatar Darin Adler

Wrote a script to check for files that forget to include <config.h> and

	* check-config-h.pl: Wrote a script to check for files that forget
	to include <config.h> and optionally edit to add it.

        * src/nautilus-zoom-control.c (set_zoom_level): Fixed the bug
	number in a FIXME.

        * docs/style-guide.html: Added one more tip.

        * check-FIXME.pl: Use my newfound Perl knowledge to spruce it up.

        * components/help/converters/gnome-db2html2/gdb3html.c:
        * components/help/converters/gnome-db2html2/sect-elements.c:
        * components/help/converters/gnome-db2html2/sect-preparse.c:
        * components/help/converters/gnome-db2html2/toc-elements.c:
        * components/help/converters/gnome-info2html2/html.c:
        * components/help/converters/gnome-info2html2/main.c:
        * components/help/converters/gnome-info2html2/parse.c:
        * components/help/converters/gnome-info2html2/utils.c:
        * components/help/converters/gnome-man2html2/gnome-man2html.c:
        * components/help/hyperbola-filefmt.c:
        * components/help/hyperbola-nav-index.c:
        * components/help/hyperbola-nav-search.c:
        * components/help/hyperbola-nav-tree.c:
        * components/html/glibwww-callbacks.c:
        * components/html/glibwww-init.c:
        * components/html/glibwww-trans.c:
        * components/html/gnome-dialogs.c:
        * components/html/ntl-web-browser.c:
        * components/services/install/eazel-install-metadata.c:
        * components/services/install/eazel-install-protocols.c:
        * components/services/install/eazel-install-rpm-glue.c:
        * components/services/install/eazel-install-tests.c:
        * components/services/install/eazel-install-utils.c:
        * components/services/install/eazel-install-xml-package-list.c:
        * components/services/install/eazel-install.c:
        * components/services/install/helixcode-install-utils.c:
        * components/services/startup/eazel-register.c:
        * components/websearch/ntl-web-search.c:
        * helper-utilities/authenticate/nautilus-authenticate-fork.c:
        * helper-utilities/authenticate/nautilus-authenticate-pam.c:
        * helper-utilities/authenticate/nautilus-authenticate.c:
        * libnautilus-extensions/nautilus-bonobo-extensions.c:
        * libnautilus-extensions/nautilus-file-utilities.c:
        * libnautilus-extensions/nautilus-glib-extensions.c:
        * libnautilus-extensions/nautilus-link.c:
        * libnautilus-extensions/nautilus-mime-type.c:
        * libnautilus-extensions/nautilus-undo-transaction.c:
        * librsvg/art_rgba.c:
        * librsvg/art_rgba_svp.c:
        * librsvg/rsvg-bpath-util.c:
        * librsvg/rsvg-path.c:
        * librsvg/rsvg.c:
        * librsvg/test-rsvg.c:
        * nautilus-widgets/nautilus-caption-table.c:
        * nautilus-widgets/nautilus-password-dialog.c:
        * nautilus-widgets/nautilus-preferences-box.c:
        * nautilus-widgets/nautilus-preferences-dialog.c:
        * nautilus-widgets/nautilus-preferences-group.c:
        * nautilus-widgets/nautilus-preferences-item.c:
        * nautilus-widgets/nautilus-preferences-pane.c:
        * nautilus-widgets/nautilus-radio-button-group.c:
        * nautilus-widgets/test-nautilus-widgets.c:
        * nautilus-widgets/test-preferences.c:
        * src/file-manager/desktop-item.c:
        * src/file-manager/desktop-layout.c:
        * src/file-manager/desktop-menu.c:
        * src/nautilus-bookmarks-window.c:
        * src/nautilus-gconf.c:
	* src/nautilus-window-menus.c:
        * src/nautilus-window-toolbars.c:
	* src/nautilus-zoom-control.c
        * src/nautilus-zoomable-frame-svr.c:
        * src/ntl-app.c:
        * src/ntl-content-view.c:
        * src/ntl-main.c:
        * src/ntl-meta-view.c:
        * src/ntl-miniicon.c:
        * src/ntl-uri-map.c:
        * src/ntl-view-frame-svr.c:
        * src/ntl-view.c:
        * src/ntl-window-state.c:
	Added includes of <config.h>.
parent f115ffb6
2000-05-01 Darin Adler <darin@eazel.com>
* check-config-h.pl: Wrote a script to check for files that forget
to include <config.h> and optionally edit to add it.
* src/nautilus-zoom-control.c (set_zoom_level): Fixed the bug
number in a FIXME.
* docs/style-guide.html: Added one more tip.
* check-FIXME.pl: Use my newfound Perl knowledge to spruce it up.
* components/help/converters/gnome-db2html2/gdb3html.c:
* components/help/converters/gnome-db2html2/sect-elements.c:
* components/help/converters/gnome-db2html2/sect-preparse.c:
* components/help/converters/gnome-db2html2/toc-elements.c:
* components/help/converters/gnome-info2html2/html.c:
* components/help/converters/gnome-info2html2/main.c:
* components/help/converters/gnome-info2html2/parse.c:
* components/help/converters/gnome-info2html2/utils.c:
* components/help/converters/gnome-man2html2/gnome-man2html.c:
* components/help/hyperbola-filefmt.c:
* components/help/hyperbola-nav-index.c:
* components/help/hyperbola-nav-search.c:
* components/help/hyperbola-nav-tree.c:
* components/html/glibwww-callbacks.c:
* components/html/glibwww-init.c:
* components/html/glibwww-trans.c:
* components/html/gnome-dialogs.c:
* components/html/ntl-web-browser.c:
* components/services/install/eazel-install-metadata.c:
* components/services/install/eazel-install-protocols.c:
* components/services/install/eazel-install-rpm-glue.c:
* components/services/install/eazel-install-tests.c:
* components/services/install/eazel-install-utils.c:
* components/services/install/eazel-install-xml-package-list.c:
* components/services/install/eazel-install.c:
* components/services/install/helixcode-install-utils.c:
* components/services/startup/eazel-register.c:
* components/websearch/ntl-web-search.c:
* helper-utilities/authenticate/nautilus-authenticate-fork.c:
* helper-utilities/authenticate/nautilus-authenticate-pam.c:
* helper-utilities/authenticate/nautilus-authenticate.c:
* libnautilus-extensions/nautilus-bonobo-extensions.c:
* libnautilus-extensions/nautilus-file-utilities.c:
* libnautilus-extensions/nautilus-glib-extensions.c:
* libnautilus-extensions/nautilus-link.c:
* libnautilus-extensions/nautilus-mime-type.c:
* libnautilus-extensions/nautilus-undo-transaction.c:
* librsvg/art_rgba.c:
* librsvg/art_rgba_svp.c:
* librsvg/rsvg-bpath-util.c:
* librsvg/rsvg-path.c:
* librsvg/rsvg.c:
* librsvg/test-rsvg.c:
* nautilus-widgets/nautilus-caption-table.c:
* nautilus-widgets/nautilus-password-dialog.c:
* nautilus-widgets/nautilus-preferences-box.c:
* nautilus-widgets/nautilus-preferences-dialog.c:
* nautilus-widgets/nautilus-preferences-group.c:
* nautilus-widgets/nautilus-preferences-item.c:
* nautilus-widgets/nautilus-preferences-pane.c:
* nautilus-widgets/nautilus-radio-button-group.c:
* nautilus-widgets/test-nautilus-widgets.c:
* nautilus-widgets/test-preferences.c:
* src/file-manager/desktop-item.c:
* src/file-manager/desktop-layout.c:
* src/file-manager/desktop-menu.c:
* src/nautilus-bookmarks-window.c:
* src/nautilus-gconf.c:
* src/nautilus-window-menus.c:
* src/nautilus-window-toolbars.c:
* src/nautilus-zoom-control.c
* src/nautilus-zoomable-frame-svr.c:
* src/ntl-app.c:
* src/ntl-content-view.c:
* src/ntl-main.c:
* src/ntl-meta-view.c:
* src/ntl-miniicon.c:
* src/ntl-uri-map.c:
* src/ntl-view-frame-svr.c:
* src/ntl-view.c:
* src/ntl-window-state.c:
Added includes of <config.h>.
2000-05-01 Gene Z. Ragan <gzr@eazel.com>
* libnautilus-extensions/nautilus-icon-text-item.c
......
......@@ -33,20 +33,23 @@ use strict;
my %skip_files;
if (!@ARGV)
{
@ARGV = `find -name '*' -and ! \\( -name '*~' -or -name '#*' -or -name 'ChangeLog*' -or -name 'Entries' -or -name 'check-FIXME.pl' \\)`;
$skip_files{"./TODO"} = 1;
$skip_files{"./autogen.sh"} = 1;
$skip_files{"./aclocal.m4"} = 1;
$skip_files{"./config.sub"} = 1;
$skip_files{"./libtool"} = 1;
$skip_files{"./ltconfig"} = 1;
$skip_files{"./ltmain.sh"} = 1;
$skip_files{"./macros/gnome-fileutils.m4"} = 1;
$skip_files{"./macros/gnome-objc-checks.m4"} = 1;
$skip_files{"./macros/gnome-vfs.m4"} = 1;
$skip_files{"./src/file-manager/desktop-canvas.c"} = 1;
$skip_files{"./src/file-manager/desktop-layout.c"} = 1;
$skip_files{"./src/file-manager/desktop-window.c"} = 1;
@ARGV = `find -name '*' -and ! \\( -name '*~' -or -name '#*' -or -name 'ChangeLog*' -or -name 'Entries' \\)`;
%skip_files =
(
"./TODO" => 1,
"./aclocal.m4" => 1,
"./check-FIXME.pl" => 1,
"./config.sub" => 1,
"./libtool" => 1,
"./ltconfig" => 1,
"./ltmain.sh" => 1,
"./macros/gnome-fileutils.m4" => 1,
"./macros/gnome-objc-checks.m4" => 1,
"./macros/gnome-vfs.m4" => 1,
"./src/file-manager/desktop-canvas.c" => 1,
"./src/file-manager/desktop-layout.c" => 1,
"./src/file-manager/desktop-window.c" => 1,
);
}
# locate all of the target lines
......
#!/usr/bin/perl -w
# -*- Mode: perl; indent-tabs-mode: nil -*-
#
# Nautilus
#
# Copyright (C) 2000 Eazel, Inc.
#
# This library 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 2 of the
# License, or (at your option) any later version.
#
# This library 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 this library; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
# Author: Darin Adler <darin@eazel.com>,
#
# check-config-h.pl: Search for .c files where someone forgot to
# put an include for <config.h> in.
use diagnostics;
use strict;
use Getopt::Long;
my $edit = 0;
&GetOptions("edit" => \$edit);
# default to all the files starting from the current directory
my %skip_files;
if (!@ARGV)
{
@ARGV = `find -name '*.c'`;
}
# locate all of the target lines
my @missing_files;
FILE: foreach my $file (@ARGV)
{
chomp $file;
next if $skip_files{$file};
open FILE, $file or die "can't open $file";
while (<FILE>)
{
next FILE if /generated by/;
next FILE if /^\s*\#\s*include\s*[<\"]config\.h[>\"]/;
}
close FILE;
push @missing_files, $file;
}
if (@missing_files)
{
print "\n", scalar(@missing_files), " C files don't have bug reports:\n\n";
if (!$edit)
{
print join("\n", @missing_files), "\n";
}
else
{
foreach my $file (@missing_files)
{
open OLD, $file or die "can't open $file";
open NEW, "> $file.new" or die "can't open $file.new";
while (<OLD>)
{
if (/^\s*\#\s*include\s/)
{
print NEW "$&<config.h>\n";
print NEW;
last;
}
print NEW;
}
print NEW <OLD>;
close NEW;
close OLD;
rename "$file.new", $file or die "can't rename $file";
print "edited $file\n";
}
}
}
#include <config.h>
#include "gdb3html.h"
#include "toc-elements.h"
#include "sect-elements.h"
......
#include <config.h>
#include "sect-elements.h"
#include "gnome.h"
......
#include <config.h>
#include "sect-elements.h"
#include "gnome.h"
......
#include <config.h>
#include "toc-elements.h"
......
/* handles all html operations */
#include <config.h>
#include <stdio.h>
#include <unistd.h>
#include <ctype.h>
......
/* little test main() to see how we're doing */
#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
......
......@@ -2,6 +2,7 @@
/* currently only finds nodes and contructs a tree */
/* partially motivated by source code of the 'info' program */
#include <config.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
......
/* various utility functions */
#include <config.h>
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
......
......@@ -122,6 +122,7 @@
*/
#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
......
#include <config.h>
#include <gnome.h>
#include <zlib.h>
......
#include <config.h>
#include <libnautilus/libnautilus.h>
#include <gnome.h>
#include "hyperbola-filefmt.h"
......
#include <config.h>
#include <libnautilus/libnautilus.h>
#include <gnome.h>
#include "hyperbola-filefmt.h"
......
#include <config.h>
#include <libnautilus/libnautilus.h>
#include "hyperbola-filefmt.h"
#include <gtk/gtk.h>
......
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#include <config.h>
#include "glibwww.h"
#include <HTEvent.h>
#include <HTTimer.h>
......
......@@ -15,7 +15,7 @@
#undef _
#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif
#include <glib.h>
#include "glibwww.h"
......
......@@ -8,7 +8,7 @@
#undef _
#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif
#include "glibwww.h"
#include <stdio.h>
......
......@@ -10,7 +10,7 @@
#undef _
#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif
#include "glibwww.h"
......
#include <config.h>
#include <WWWCore.h>
#include <WWWStream.h>
#include <WWWTrans.h>
......
......@@ -25,6 +25,7 @@
* file and install a services generated package-list.xml.
*/
#include <config.h>
#include "eazel-install-metadata.h"
static gboolean create_default_configuration_metafile (const char* target_file);
......
......@@ -26,6 +26,7 @@
* file and install a services generated package-list.xml.
*/
#include <config.h>
#include "eazel-install-protocols.h"
gboolean
......
......@@ -25,6 +25,7 @@
* file and install a services generated package-list.xml.
*/
#include <config.h>
#include "eazel-install-rpm-glue.h"
gboolean
......
......@@ -25,6 +25,7 @@
* file and install a services generated package-list.xml.
*/
#include <config.h>
#include "eazel-install-tests.h"
InstallOptions*
......
......@@ -26,4 +26,5 @@
* file and install a services generated package-list.xml.
*/
#include <config.h>
#include "eazel-install-utils.h"
......@@ -27,6 +27,7 @@
* file and install a services generated package-list.xml.
*/
#include <config.h>
#include "eazel-install-xml-package-list.h"
static PackageData* parse_package (xmlNode* package);
......
......@@ -28,6 +28,7 @@
* file and install a services generated package-list.xml.
*/
#include <config.h>
#include "eazel-install-types.h"
#include "eazel-install-protocols.h"
#include "eazel-install-rpm-glue.h"
......
......@@ -25,6 +25,7 @@
/* Most of this code is taken directly from Joe Shaw's Helix Code install / Updater
* with a few very minor changes made by me. */
#include <config.h>
#include "helixcode-install-utils.h"
char*
......
......@@ -24,6 +24,7 @@
*
*/
#include <config.h>
#include <gdk/gdk.h>
#include <stdio.h>
#include <fcntl.h>
......
......@@ -23,8 +23,8 @@
*
*/
/* ntl-web-search.c: Rewrite KWebSearch using Gtk+ and Nautilus */
#include "config.h"
#include <config.h>
#include <libnautilus/libnautilus.h>
#include <gnome.h>
#include <liboaf/liboaf.h>
......
......@@ -32,7 +32,8 @@ braces that open the block for an if statement on the same line as the
if statement (part of Linux kernel brace style).</p>
<p><b>We prefer to use words rather than acronyms or abbreviations.</b> This means that
we name classes with a prefix like Nautilus, not Ntl, for example.</p>
we name classes with a prefix like Nautilus, not Ntl, for example. And we use variables
named result rather than retval or rv.</p>
<p><b>We strive to have a minimum number of local variables.</b> This makes it
easier to move pieces of code around. For more on this, read
......
......@@ -24,6 +24,7 @@
* command. Return the process id in *pid_out.
*/
#include <config.h>
#include "nautilus-authenticate.h"
#include <stdio.h>
......
......@@ -23,6 +23,7 @@
/* nautilus-authenticate-pam.c - Use PAM to authenticate a user.
*/
#include <config.h>
#include "nautilus-authenticate.h"
#include <security/pam_appl.h>
......
......@@ -24,6 +24,7 @@
* user and execute a priviledge command on their behalf.
*/
#include <config.h>
#include "nautilus-authenticate.h"
#include <nautilus-widgets/nautilus-password-dialog.h>
......
......@@ -24,6 +24,7 @@
Author: John Sullivan <sullivan@eazel.com>
*/
#include <config.h>
#include "nautilus-bonobo-extensions.h"
......
......@@ -22,6 +22,7 @@
Authors: Ramiro Estrugo <ramiro@eazel.com>
*/
#include <config.h>
#include "nautilus-caption-table.h"
#include <gtk/gtkentry.h>
......
......@@ -22,6 +22,7 @@
Authors: John Sullivan <sullivan@eazel.com>
*/
#include <config.h>
#include "nautilus-file-utilities.h"
#include <libgnome/gnome-defs.h>
......
......@@ -24,6 +24,7 @@
Authors: John Sullivan <sullivan@eazel.com>
*/
#include <config.h>
#include "nautilus-glib-extensions.h"
#include "nautilus-lib-self-check-functions.h"
......
......@@ -22,6 +22,7 @@
Author: Andy Hertzfeld <andy@eazel.com>
*/
#include <config.h>
#include <stdlib.h>
#include <parser.h>
......
......@@ -26,6 +26,7 @@
Author: Andy Hertzfeld <andy@eazel.com>
*/
#include <config.h>
#include <string.h>
#include <stdio.h>
#include "nautilus-glib-extensions.h"
......
......@@ -19,6 +19,7 @@
* USA
*/
#include <config.h>
#include "ntl-miniicon.h"
#include <gdk/gdkprivate.h>
......
......@@ -22,6 +22,7 @@
Authors: Ramiro Estrugo <ramiro@eazel.com>
*/
#include <config.h>
#include "nautilus-password-dialog.h"
#include "nautilus-caption-table.h"
......
......@@ -23,6 +23,7 @@
*/
#include <config.h>
#include <nautilus-widgets/nautilus-preferences-box.h>
#include <libnautilus-extensions/nautilus-gtk-macros.h>
......
......@@ -22,6 +22,7 @@
Authors: Ramiro Estrugo <ramiro@eazel.com>
*/
#include <config.h>
#include <nautilus-widgets/nautilus-preferences-dialog.h>
#include <libnautilus-extensions/nautilus-gtk-macros.h>
......
......@@ -22,6 +22,7 @@
Authors: Ramiro Estrugo <ramiro@eazel.com>
*/
#include <config.h>
#include "nautilus-preferences-group.h"
#include <gnome.h>
......
......@@ -22,6 +22,7 @@
Authors: Ramiro Estrugo <ramiro@eazel.com>
*/
#include <config.h>
#include "nautilus-preferences-item.h"
#include "nautilus-preferences.h"
#include <libnautilus-extensions/nautilus-gtk-macros.h>
......
......@@ -23,6 +23,7 @@
*/
#include <config.h>
#include <nautilus-widgets/nautilus-preferences-pane.h>
#include <libnautilus-extensions/nautilus-gtk-macros.h>
......
......@@ -22,6 +22,7 @@
Authors: Ramiro Estrugo <ramiro@eazel.com>
*/
#include <config.h>
#include <nautilus-widgets/nautilus-radio-button-group.h>