PERFORCE change 125659 for review
dongmei
dongmei at FreeBSD.org
Sat Aug 25 00:32:39 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=125659
Change 125659 by dongmei at dongmei2007 on 2007/08/25 07:31:40
clean up part of codes
Affected files ...
.. //depot/projects/soc2007/dongmei-auditanalyzer/filesystem.h#2 edit
.. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/compat_macros.h#4 edit
.. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/file_dlg.c#2 edit
.. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/file_dlg.h#2 edit
.. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/gtkglobals.h#2 edit
.. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/keys.h#2 edit
.. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/main.c#5 edit
.. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/menu.h#3 edit
.. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/progress_dlg.c#2 edit
.. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/simple_dialog.c#3 edit
.. //depot/projects/soc2007/dongmei-auditanalyzer/progress_dlg.h#2 edit
.. //depot/projects/soc2007/dongmei-auditanalyzer/simple_dialog.h#4 edit
.. //depot/projects/soc2007/dongmei-auditanalyzer/strerror.c#2 edit
.. //depot/projects/soc2007/dongmei-auditanalyzer/strerror.h#2 edit
.. //depot/projects/soc2007/dongmei-auditanalyzer/tfile.c#7 edit
Differences ...
==== //depot/projects/soc2007/dongmei-auditanalyzer/filesystem.h#2 (text+ko) ====
@@ -3,23 +3,6 @@
*
* $Id: filesystem.h 20431 2007-01-14 22:25:22Z ulfl $
*
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald at wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program 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 program 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 program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef FILESYSTEM_H
@@ -68,9 +51,7 @@
/*
* Get the directory in which files that, at least on UNIX, are
- * system files (such as "/etc/ethers") are stored; on Windows,
- * there's no "/etc" directory, so we get them from the Wireshark
- * global configuration and data file directory.
+ * system files (such as "/etc/ethers") are stored;
*/
extern const char *get_systemfile_dir(void);
@@ -87,11 +68,6 @@
* Construct the path name of a personal configuration file, given the
* file name.
*
- * On Win32, if "for_writing" is FALSE, we check whether the file exists
- * and, if not, construct a path name relative to the ".wireshark"
- * subdirectory of the user's home directory, and check whether that
- * exists; if it does, we return that, so that configuration files
- * from earlier versions can be read.
*/
extern char *get_persconffile_path(const char *filename, gboolean for_writing);
==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/compat_macros.h#4 (text+ko) ====
@@ -3,23 +3,6 @@
*
* $Id: compat_macros.h 19924 2006-11-18 01:47:49Z gerald $
*
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald at wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program 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 program 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 program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/file_dlg.c#2 (text+ko) ====
@@ -3,23 +3,6 @@
*
* $Id: file_dlg.c 19046 2006-08-26 17:55:21Z gal $
*
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald at wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program 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 program 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 program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <gtk/gtk.h>
@@ -45,7 +28,7 @@
/* Keys ... */
#define E_FS_CALLER_PTR_KEY "fs_caller_ptr"
-/* Create a file selection dialog box window that belongs to Wireshark's
+/* Create a file selection dialog box window that belongs to AuditAnalyzer's
main window. */
#if (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 4) || GTK_MAJOR_VERSION > 2
GtkWidget *
==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/file_dlg.h#2 (text+ko) ====
@@ -3,23 +3,6 @@
*
* $Id: file_dlg.h 18205 2006-05-22 07:29:40Z guy $
*
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald at wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program 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 program 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 program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/** @defgroup filesel_dialog_group File Selection Dialogs
@@ -59,7 +42,7 @@
FILE_SELECTION_WRITE_BROWSE /**< browse for a file to write to */
} file_selection_action_t;
-/** Create a file selection dialog box window that belongs to Wireshark's
+/** Create a file selection dialog box window that belongs to AuditAnalyzer's
* main window. See window_new() for usage.
*
* @param title the title for the new file selection dialog
==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/gtkglobals.h#2 (text+ko) ====
@@ -3,23 +3,6 @@
*
* $Id: gtkglobals.h 18205 2006-05-22 07:29:40Z guy $
*
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald at wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program 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 program 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 program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __GTKGLOBALS_H__
@@ -29,7 +12,7 @@
*
* @section intro Introduction
*
- * Wireshark uses GTK (the Gimp ToolKit) as its user interface toolkit.
+ * AuditAnalyzer uses GTK (the Gimp ToolKit) as its user interface toolkit.
*
* See Modules for a list of submodules.
*
==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/keys.h#2 (text+ko) ====
@@ -3,23 +3,6 @@
*
* $Id: keys.h 20049 2006-12-05 19:24:25Z gerald $
*
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald at wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program 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 program 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 program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __KEYS_H__
==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/main.c#5 (text+ko) ====
@@ -141,7 +141,7 @@
return g_strdup_printf("%s", caption);
}
/* Create a new window, of the specified type, with the specified title
- (if any) and the Wireshark icon. */
+ (if any) and the Auditanalyzer icon. */
GtkWidget *
window_new(GtkWindowType type, const gchar *title)
{
==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/menu.h#3 (text+ko) ====
@@ -3,23 +3,6 @@
*
* $Id: menu.h 18197 2006-05-21 05:12:17Z sahlberg $
*
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald at wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program 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 program 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 program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __GTKGUIMENU_H__
==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/progress_dlg.c#2 (text+ko) ====
@@ -3,23 +3,6 @@
*
* $Id: progress_dlg.c 19942 2006-11-21 00:40:36Z ulfl $
*
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald at wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program 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 program 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 program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifdef HAVE_CONFIG_H
==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/simple_dialog.c#3 (text+ko) ====
@@ -80,7 +80,7 @@
#endif
}
-/* Create a dialog box window that belongs to Wireshark's main window. */
+/* Create a dialog box window that belongs to AuditAnalyzer's main window. */
GtkWidget *
dlg_window_new(const gchar *title)
{
@@ -508,14 +508,14 @@
* shouldn't say "error", as that provides no useful information.
*
* So we give it a title on Win32, and don't give it one on UN*X.
- * For now, we give it a Win32 title of just "Wireshark"; we should
+ * For now, we give it a Win32 title of just "AuditAnalyzer"; we should
* arguably take an argument for the title.
*/
if(btn_mask == ESD_BTN_NONE) {
win = splash_window_new();
} else {
#ifdef _WIN32
- win = dlg_window_new("Wireshark");
+ win = dlg_window_new("AuditAnalyzer");
#else
win = dlg_window_new("");
#endif
==== //depot/projects/soc2007/dongmei-auditanalyzer/progress_dlg.h#2 (text+ko) ====
@@ -3,23 +3,6 @@
*
* $Id: progress_dlg.h 18197 2006-05-21 05:12:17Z sahlberg $
*
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald at wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program 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 program 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 program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __PROGRESS_DLG_H__
==== //depot/projects/soc2007/dongmei-auditanalyzer/simple_dialog.h#4 (text+ko) ====
@@ -4,23 +4,6 @@
*
* $Id: simple_dialog.h 18197 2006-05-21 05:12:17Z sahlberg $
*
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald at wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program 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 program 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 program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __DIALOG_H__
==== //depot/projects/soc2007/dongmei-auditanalyzer/strerror.c#2 (text+ko) ====
@@ -2,23 +2,6 @@
*
* $Id: strerror.c 18197 2006-05-21 05:12:17Z sahlberg $
*
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald at wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program 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 program 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 program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "strerror.h"
==== //depot/projects/soc2007/dongmei-auditanalyzer/strerror.h#2 (text+ko) ====
@@ -2,23 +2,6 @@
*
* $Id: strerror.h 18197 2006-05-21 05:12:17Z sahlberg $
*
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald at zing.org>
- * Copyright 1998 Gerald Combs
- *
- * This program 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 program 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 program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __STRERROR_H__
==== //depot/projects/soc2007/dongmei-auditanalyzer/tfile.c#7 (text+ko) ====
@@ -355,10 +355,8 @@
dialog = simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
"%sOut Of Memory!%s\n"
"\n"
- "Sorry, but Wireshark has to terminate now!\n"
- "\n"
- "Some infos / workarounds can be found at:\n"
- "http://wiki.wireshark.org/KnownBugs/OutOfMemory",
+ "Sorry, but AuditAnalyzer has to terminate now!\n"
+ "\n",
simple_dialog_primary_start(), simple_dialog_primary_end());
/* we have to terminate, as we cannot recover from the memory error */
simple_dialog_set_cb(dialog, outofmemory_cb, NULL);
@@ -439,10 +437,8 @@
dialog = simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
"%sOut Of Memory!%s\n"
"\n"
- "Sorry, but Wireshark has to terminate now!\n"
- "\n"
- "Some infos / workarounds can be found at:\n"
- "http://wiki.wireshark.org/KnownBugs/OutOfMemory",
+ "Sorry, but AuditAnalyzer has to terminate now!\n"
+ "\n",
simple_dialog_primary_start(), simple_dialog_primary_end());
/* we have to terminate, as we cannot recover from the memory error */
simple_dialog_set_cb(dialog, outofmemory_cb, NULL);
More information about the p4-projects
mailing list