diff options
author | Geoff Nixon <geoff.nixon@aol.com> | 2014-02-27 02:55:04 -0800 |
---|---|---|
committer | Geoff Nixon <geoff.nixon@aol.com> | 2014-02-27 06:23:40 -0800 |
commit | 18dd6f58e3b9bc44d9850947bdb3f17c2f05f2cf (patch) | |
tree | a9cecef0c6d630ab11ccfa02c466a236d6d2126b | |
parent | ddcd2b0810087394d17bd80c46d74cca0acd8924 (diff) |
Fixes .c -> .cpp in comments. For doxygen.
61 files changed, 107 insertions, 77 deletions
@@ -422,7 +422,7 @@ INPUT = # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp # *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm -FILE_PATTERNS = *.h *.c +FILE_PATTERNS = *.h *.cpp # The RECURSIVE tag can be used to turn specify whether or not subdirectories # should be searched for input files as well. Possible values are YES and NO. diff --git a/builtin.cpp b/builtin.cpp index 8b8b8d5c..947276e2 100644 --- a/builtin.cpp +++ b/builtin.cpp @@ -1,4 +1,4 @@ -/** \file builtin.c +/** \file builtin.cpp Functions for executing builtin functions. How to add a new builtin function: diff --git a/builtin_commandline.cpp b/builtin_commandline.cpp index 564eee7b..1dac978d 100644 --- a/builtin_commandline.cpp +++ b/builtin_commandline.cpp @@ -1,4 +1,4 @@ -/** \file builtin_commandline.c Functions defining the commandline builtin +/** \file builtin_commandline.cpp Functions defining the commandline builtin Functions used for implementing the commandline builtin. diff --git a/builtin_complete.cpp b/builtin_complete.cpp index 6e395f94..ea69fa30 100644 --- a/builtin_complete.cpp +++ b/builtin_complete.cpp @@ -1,4 +1,4 @@ -/** \file builtin_complete.c Functions defining the complete builtin +/** \file builtin_complete.cpp Functions defining the complete builtin Functions used for implementing the complete builtin. @@ -279,8 +279,8 @@ const wchar_t *builtin_complete_get_temporary_buffer() /** The complete builtin. Used for specifying programmable - tab-completions. Calls the functions in complete.c for any heavy - lifting. Defined in builtin_complete.c + tab-completions. Calls the functions in complete.cpp for any heavy + lifting. Defined in builtin_complete.cpp */ static int builtin_complete(parser_t &parser, wchar_t **argv) { diff --git a/builtin_jobs.cpp b/builtin_jobs.cpp index c6ca7713..a21aeafc 100644 --- a/builtin_jobs.cpp +++ b/builtin_jobs.cpp @@ -1,4 +1,4 @@ -/** \file builtin_jobs.c +/** \file builtin_jobs.cpp Functions for executing the jobs builtin. */ #include "config.h" diff --git a/builtin_printf.cpp b/builtin_printf.cpp index 1a1ab335..92be1a96 100644 --- a/builtin_printf.cpp +++ b/builtin_printf.cpp @@ -1,3 +1,6 @@ +/** \file builtin_printf.cpp +*/ + /* printf - format and print data Copyright (C) 1990-2007 Free Software Foundation, Inc. diff --git a/builtin_set.cpp b/builtin_set.cpp index 63341649..399b7e82 100644 --- a/builtin_set.cpp +++ b/builtin_set.cpp @@ -1,4 +1,4 @@ -/** \file builtin_set.c Functions defining the set builtin +/** \file builtin_set.cpp Functions defining the set builtin Functions used for implementing the set builtin. diff --git a/builtin_test.cpp b/builtin_test.cpp index a2045cc4..6a353029 100644 --- a/builtin_test.cpp +++ b/builtin_test.cpp @@ -646,7 +646,6 @@ expression *test_parser::parse_args(const wcstring_list_t &args, wcstring &err) expression *result = parser.parse_expression(0, (unsigned int)args.size()); /* Handle errors */ - bool errored = false; for (size_t i = 0; i < parser.errors.size(); i++) { err.append(L"test: "); diff --git a/builtin_ulimit.cpp b/builtin_ulimit.cpp index 37bebd61..7a0731f1 100644 --- a/builtin_ulimit.cpp +++ b/builtin_ulimit.cpp @@ -1,4 +1,4 @@ -/** \file builtin_ulimit.c Functions defining the ulimit builtin +/** \file builtin_ulimit.cpp Functions defining the ulimit builtin Functions used for implementing the ulimit builtin. @@ -1,4 +1,4 @@ -/** \file common.c +/** \file common.cpp Various functions, mostly string utilities, that are used by most parts of fish. diff --git a/complete.cpp b/complete.cpp index 9b8d5c0b..aee35bbd 100644 --- a/complete.cpp +++ b/complete.cpp @@ -1,4 +1,4 @@ -/** \file complete.c Functions related to tab-completion. +/** \file complete.cpp Functions related to tab-completion. These functions are used for storing and retrieving tab-completion data, as well as for performing tab-completion. */ @@ -1,4 +1,4 @@ -/** \file env.c +/** \file env.cpp Functions for setting and getting environment variables. */ #include "config.h" diff --git a/env_universal.cpp b/env_universal.cpp index 72e9cc0e..7e2a0970 100644 --- a/env_universal.cpp +++ b/env_universal.cpp @@ -1,3 +1,9 @@ +/** \file env_universal.cpp + +Various functions, mostly string utilities, that are used by most +parts of fish. +*/ + #include "config.h" diff --git a/env_universal_common.cpp b/env_universal_common.cpp index dbf79c1a..2b54a3bc 100644 --- a/env_universal_common.cpp +++ b/env_universal_common.cpp @@ -1,5 +1,4 @@ -/** - \file env_universal_common.c +/** \file env_universal_common.cpp The utility library for universal variables. Used both by the client library and by the daemon. @@ -1,4 +1,4 @@ -/** \file event.c +/** \file event.cpp Functions for handling event triggers @@ -1,4 +1,4 @@ -/** \file exec.c +/** \file exec.cpp Functions for executing a program. Some of the code in this file is based on code from the Glibc @@ -1,4 +1,4 @@ -/**\file expand.c +/**\file expand.cpp String expansion functions. These functions perform several kinds of parameter expansion. diff --git a/fallback.cpp b/fallback.cpp index d26907e2..48a6a220 100644 --- a/fallback.cpp +++ b/fallback.cpp @@ -1,4 +1,5 @@ -/** +/** \file fallback.cpp + This file only contains fallback implementations of functions which have been found to be missing or broken by the configuration scripts. @@ -1,3 +1,6 @@ +/** \file fish.cpp + The main loop of fish. +*/ /* Copyright (C) 2005-2008 Axel Liljencrantz @@ -15,11 +18,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ - -/** \file fish.c - The main loop of <tt>fish</tt>. -*/ - #include "config.h" diff --git a/fish_indent.cpp b/fish_indent.cpp index 4560bb96..ec668a83 100644 --- a/fish_indent.cpp +++ b/fish_indent.cpp @@ -1,3 +1,6 @@ +/** \file fish_indent.cpp + The fish_indent proegram. +*/ /* Copyright (C) 2005-2008 Axel Liljencrantz @@ -15,11 +18,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ - -/** \file fish_indent.cpp - The fish_indent proegram. -*/ - #include "config.h" #include <stdlib.h> diff --git a/fish_pager.cpp b/fish_pager.cpp index f640e995..f0103be3 100644 --- a/fish_pager.cpp +++ b/fish_pager.cpp @@ -1,3 +1,7 @@ +/** \file fish_pager.cpp +*/ + + #include "config.h" #include <stdlib.h> @@ -439,9 +443,6 @@ static void completion_print_item(const wchar_t *prefix, comp_t *c, int width, b writech(L' '); } set_color(get_color(HIGHLIGHT_PAGER_DESCRIPTION), bg); - written += print_max(L"(", 1, 0); - written += print_max(c->desc.c_str(), desc_width, 0); - written += print_max(L")", 1, 0); } else { diff --git a/fish_tests.cpp b/fish_tests.cpp index 7e82193c..6494c6d3 100644 --- a/fish_tests.cpp +++ b/fish_tests.cpp @@ -1,4 +1,4 @@ -/** \file fish_tests.c +/** \file fish_tests.cpp Various bug and feature tests. Compiled and run by make test. */ @@ -1,4 +1,4 @@ -/** \file fishd.c +/** \file fishd.cpp The universal variable server. fishd is automatically started by fish if a fishd server isn't already running. fishd reads any saved diff --git a/function.cpp b/function.cpp index 8421a4da..e58652c1 100644 --- a/function.cpp +++ b/function.cpp @@ -1,4 +1,4 @@ -/** \file function.c +/** \file function.cpp Prototypes for functions for storing and retrieving function information. These functions also take care of autoloading diff --git a/highlight.cpp b/highlight.cpp index eaaec750..21694884 100644 --- a/highlight.cpp +++ b/highlight.cpp @@ -1,4 +1,4 @@ -/** \file highlight.c +/** \file highlight.cpp Functions for syntax highlighting */ #include "config.h" diff --git a/history.cpp b/history.cpp index 0c7bc618..f8183f5d 100644 --- a/history.cpp +++ b/history.cpp @@ -1338,7 +1338,7 @@ bool history_t::save_internal_via_rewrite() for (size_t attempt = 0; attempt < 10 && out_fd == -1; attempt++) { char *narrow_str = wcs2str(tmp_name_template.c_str()); - if (narrow_str && mkstemp(narrow_str)) + if (narrow_str && mktemp(narrow_str)) { /* It was successfully templated; try opening it atomically */ tmp_name = str2wcstring(narrow_str); @@ -1507,6 +1507,11 @@ void history_t::save_internal(bool vacuum) /* Try doing a fast append */ ok = save_internal_via_appending(); } + if (! ok) + { + /* We did not or could not append; rewrite the file ("vacuum" it) */ + ok = this->save_internal_via_rewrite(); + } } void history_t::save(void) @@ -1,4 +1,4 @@ -/** \file input.c +/** \file input.cpp Functions for reading a character of input from stdin. diff --git a/input_common.cpp b/input_common.cpp index d26f30b9..c9a2afbf 100644 --- a/input_common.cpp +++ b/input_common.cpp @@ -1,4 +1,4 @@ -/** \file input_common.c +/** \file input_common.cpp Implementation file for the low level input library @@ -1,4 +1,4 @@ -/** \file intern.c +/** \file intern.cpp Library for pooling common strings @@ -1,4 +1,4 @@ -/** \file io.c +/** \file io.cpp Utilities for io redirection. diff --git a/iothread.cpp b/iothread.cpp index 73646792..dbdff7dd 100644 --- a/iothread.cpp +++ b/iothread.cpp @@ -1,3 +1,6 @@ +/** \file iothread.cpp +*/ + #include "config.h" #include "iothread.h" #include "common.h" diff --git a/key_reader.cpp b/key_reader.cpp index fae6f33f..74347ba8 100644 --- a/key_reader.cpp +++ b/key_reader.cpp @@ -1,4 +1,5 @@ -/* +/** \file key_reader.cpp + A small utility to print the resulting key codes from pressing a key. Servers the same function as hitting ^V in bash, but I prefer the way key_reader works. @@ -1,4 +1,4 @@ -/** \file kill.c +/** \file kill.cpp The killring. Works like the killring in emacs and readline. The killring is cut @@ -1,4 +1,4 @@ -/** \file mimedb.c +/** \file mimedb.cpp mimedb is a program for checking the mimetype, description and default action associated with a file or mimetype. It uses the @@ -1,4 +1,4 @@ -/** \file output.c +/** \file output.cpp Generic output functions */ @@ -1,3 +1,7 @@ +/** \file pager.cpp +*/ + + #include "config.h" #include "pager.h" @@ -145,8 +149,6 @@ line_t pager_t::completion_print_item(const wcstring &prefix, const comp_t *c, s { written += print_max(L" ", packed_color, 1, false, &line_data); } - written += print_max(L"(", packed_color, 1, false, &line_data); - written += print_max(c->desc, packed_color, desc_width, false, &line_data); } else { @@ -630,10 +632,6 @@ bool pager_t::completion_try_print(size_t cols, const wcstring &prefix, const co { search_field_text.append(PAGER_SEARCH_FIELD_WIDTH - search_field_text.size(), L' '); } - line_t *search_field = &rendering->screen_data.insert_line_at_index(0); - - /* We limit the width to term_width - 1 */ - int search_field_written = print_max(SEARCH_FIELD_PROMPT, highlight_spec_normal, term_width - 1, false, search_field); } } diff --git a/parse_execution.cpp b/parse_execution.cpp index d57b8e7e..13fbf0bb 100644 --- a/parse_execution.cpp +++ b/parse_execution.cpp @@ -506,7 +506,6 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(const pars parse_execution_result_t parse_execution_context_t::run_switch_statement(const parse_node_t &statement) { assert(statement.type == symbol_switch_statement); - parse_execution_result_t ret = parse_execution_success; const parse_node_t *matching_case_item = NULL; parse_execution_result_t result = parse_execution_success; diff --git a/parse_productions.cpp b/parse_productions.cpp index d559a0d9..d071be09 100644 --- a/parse_productions.cpp +++ b/parse_productions.cpp @@ -1,3 +1,7 @@ +/** \file parse_productions.cpp +*/ + + #include "parse_productions.h" using namespace parse_productions; diff --git a/parse_tree.cpp b/parse_tree.cpp index eb139e63..9a174c73 100644 --- a/parse_tree.cpp +++ b/parse_tree.cpp @@ -1,3 +1,6 @@ +/** \file parse_tree.cpp +*/ + #include "parse_productions.h" #include "tokenizer.h" #include "fallback.h" diff --git a/parse_util.cpp b/parse_util.cpp index 230a328c..4802d7cc 100644 --- a/parse_util.cpp +++ b/parse_util.cpp @@ -1,4 +1,4 @@ -/** \file parse_util.c +/** \file parse_util.cpp Various mostly unrelated utility functions related to parsing, loading and evaluating fish code. @@ -1,4 +1,4 @@ -/** \file parser.c +/** \file parser.cpp The fish parser. Contains functions for parsing and evaluating code. @@ -2590,9 +2590,6 @@ int parser_t::eval_new_parser(const wcstring &cmd, const io_chain_t &io, enum bl parse_execution_context_t *ctx = new parse_execution_context_t(tree, cmd, this, exec_eval_level); execution_contexts.push_back(ctx); - /* Execute the first node */ - int result = 1; - /* Clean up the execution context stack */ assert(! execution_contexts.empty() && execution_contexts.back() == ctx); execution_contexts.pop_back(); diff --git a/parser_keywords.cpp b/parser_keywords.cpp index 8aacd806..801cc3c8 100644 --- a/parser_keywords.cpp +++ b/parser_keywords.cpp @@ -1,4 +1,4 @@ -/** \file parser_keywords.c +/** \file parser_keywords.cpp Functions having to do with parser keywords, like testing if a function is a block command. */ @@ -1,3 +1,7 @@ +/** \file path.cpp +*/ + + #include "config.h" #include <stdlib.h> diff --git a/print_help.cpp b/print_help.cpp index 06bed30c..965de7ec 100644 --- a/print_help.cpp +++ b/print_help.cpp @@ -1,5 +1,4 @@ - -/** \file print_help.c +/** \file print_help.cpp Print help message for the specified command */ @@ -1,4 +1,4 @@ -/** \file proc.c +/** \file proc.cpp Utilities for keeping track of jobs, processes and subshells, as well as signal handling functions for tracking children. These @@ -383,8 +383,6 @@ static void mark_process_status(const job_t *j, process_t *p, int status) } else { - ssize_t ignore; - /* This should never be reached */ p->completed = 1; @@ -1,4 +1,4 @@ -/** \file reader.c +/** \file reader.cpp Functions for reading data from stdin and passing to the parser. If stdin is a keyboard, it supplies a killring, history, @@ -1,4 +1,4 @@ -/** \file sanity.c +/** \file sanity.cpp Functions for performing sanity checks on the program state */ #include "config.h" @@ -1,4 +1,4 @@ -/** \file screen.c High level library for handling the terminal screen +/** \file screen.cpp High level library for handling the terminal screen The screen library allows the interactive reader to write its output to screen efficiently by keeping an internal representation @@ -298,7 +298,6 @@ size_t escape_code_length(const wchar_t *code) if (code[1] >= L'@' && code[1] <= L'_') { resulting_length = 2; - found = true; } } diff --git a/share/doxygen_sqlite3.db b/share/doxygen_sqlite3.db Binary files differnew file mode 100644 index 00000000..0efa2bc7 --- /dev/null +++ b/share/doxygen_sqlite3.db @@ -1,4 +1,4 @@ -/** \file signal.c +/** \file signal.cpp The library for various signal related issues @@ -477,7 +477,7 @@ static void handle_int(int sig, siginfo_t *info, void *context) } /** - sigchld handler. Does notification and calls the handler in proc.c + sigchld handler. Does notification and calls the handler in proc.cpp */ static void handle_chld(int sig, siginfo_t *info, void *context) { diff --git a/tokenizer.cpp b/tokenizer.cpp index 67b35fff..7e4fe02e 100644 --- a/tokenizer.cpp +++ b/tokenizer.cpp @@ -1,4 +1,4 @@ -/** \file tokenizer.c +/** \file tokenizer.cpp A specialized tokenizer for tokenizing the fish language. In the future, the tokenizer should be extended to support marks, @@ -1,4 +1,4 @@ -/** \file util.c +/** \file util.cpp Generic utilities library. Contains datastructures such as automatically growing array lists, priority queues, etc. diff --git a/wgetopt.cpp b/wgetopt.cpp index ecf1121e..c28d5dc1 100644 --- a/wgetopt.cpp +++ b/wgetopt.cpp @@ -1,4 +1,4 @@ -/** \file wgetopt.c +/** \file wgetopt.cpp A version of the getopt library for use with wide character strings. This is simply the gnu getopt library, but converted for use with diff --git a/wildcard.cpp b/wildcard.cpp index 2b93561b..8682f75e 100644 --- a/wildcard.cpp +++ b/wildcard.cpp @@ -1,4 +1,4 @@ -/** \file wildcard.c +/** \file wildcard.cpp Fish needs it's own globbing implementation to support tab-expansion of globbed parameters. Also provides recursive @@ -1,4 +1,4 @@ -/** \file wutil.c +/** \file wutil.cpp Wide character equivalents of various standard unix functions. */ diff --git a/xdgmime.cpp b/xdgmime.cpp index 633d0b0a..52a8f21b 100644 --- a/xdgmime.cpp +++ b/xdgmime.cpp @@ -1,3 +1,6 @@ +/** \file xdgmime.cpp +*/ + /* -*- mode: C; c-file-style: "gnu" -*- */ /* xdgmime.c: XDG Mime Spec mime resolver. Based on version 0.11 of the spec. * diff --git a/xdgmimealias.cpp b/xdgmimealias.cpp index e556d4e6..4636b565 100644 --- a/xdgmimealias.cpp +++ b/xdgmimealias.cpp @@ -1,5 +1,7 @@ +/** \file xdgmimealias.cpp +*/ /* -*- mode: C; c-file-style: "gnu" -*- */ -/* xdgmimealias.c: Private file. Datastructure for storing the aliases. +/* xdgmimealias.cpp: Private file. Datastructure for storing the aliases. * * More info can be found at http://www.freedesktop.org/standards/ * diff --git a/xdgmimeglob.cpp b/xdgmimeglob.cpp index 4182f3c9..06021d7c 100644 --- a/xdgmimeglob.cpp +++ b/xdgmimeglob.cpp @@ -1,5 +1,7 @@ +/** \file xdgmimeglob.cpp +*/ /* -*- mode: C; c-file-style: "gnu" -*- */ -/* xdgmimeglob.c: Private file. Datastructure for storing the globs. +/* xdgmimeglob.cpp: Private file. Datastructure for storing the globs. * * More info can be found at http://www.freedesktop.org/standards/ * diff --git a/xdgmimeint.cpp b/xdgmimeint.cpp index 7e8ea31c..0bad11af 100644 --- a/xdgmimeint.cpp +++ b/xdgmimeint.cpp @@ -1,5 +1,8 @@ +/** \file xdgmimeint.cpp +*/ + /* -*- mode: C; c-file-style: "gnu" -*- */ -/* xdgmimeint.c: Internal defines and functions. +/* xdgmimeint.cpp: Internal defines and functions. * * More info can be found at http://www.freedesktop.org/standards/ * diff --git a/xdgmimemagic.cpp b/xdgmimemagic.cpp index aecca882..76220220 100644 --- a/xdgmimemagic.cpp +++ b/xdgmimemagic.cpp @@ -1,3 +1,6 @@ +/** \file xdgmimemagic.cpp +*/ + /* -*- mode: C; c-file-style: "gnu" -*- */ /* xdgmimemagic.: Private file. Datastructure for storing magic files. * diff --git a/xdgmimeparent.cpp b/xdgmimeparent.cpp index d0fa617d..72fa8b08 100644 --- a/xdgmimeparent.cpp +++ b/xdgmimeparent.cpp @@ -1,3 +1,5 @@ +/** \file xdgmimeparent.cpp +*/ /* -*- mode: C; c-file-style: "gnu" -*- */ /* xdgmimealias.c: Private file. Datastructure for storing the hierarchy. * |