diff options
Diffstat (limited to 'ext')
-rw-r--r-- | ext/dl/lib/dl/func.rb | 2 | ||||
-rw-r--r-- | ext/nkf/nkf-utf8/nkf.h | 4 | ||||
-rw-r--r-- | ext/psych/lib/psych.rb | 4 | ||||
-rw-r--r-- | ext/psych/yaml/emitter.c | 8 | ||||
-rw-r--r-- | ext/psych/yaml/parser.c | 2 | ||||
-rw-r--r-- | ext/psych/yaml/reader.c | 6 | ||||
-rw-r--r-- | ext/psych/yaml/scanner.c | 10 | ||||
-rw-r--r-- | ext/psych/yaml/writer.c | 2 | ||||
-rw-r--r-- | ext/psych/yaml/yaml.h | 6 | ||||
-rw-r--r-- | ext/psych/yaml/yaml_private.h | 4 |
10 files changed, 24 insertions, 24 deletions
diff --git a/ext/dl/lib/dl/func.rb b/ext/dl/lib/dl/func.rb index fd92c119ac..12885738c7 100644 --- a/ext/dl/lib/dl/func.rb +++ b/ext/dl/lib/dl/func.rb @@ -14,7 +14,7 @@ module DL if DL.fiddle? CALL_TYPE_TO_ABI = Hash.new { |h, k| raise RuntimeError, "unsupported call type: #{k}" - }.merge({ :stdcall => + }.merge({ :stdcall => (Fiddle::Function::STDCALL rescue Fiddle::Function::DEFAULT), :cdecl => Fiddle::Function::DEFAULT, nil => Fiddle::Function::DEFAULT diff --git a/ext/nkf/nkf-utf8/nkf.h b/ext/nkf/nkf-utf8/nkf.h index 9f0f1515a2..c174c9ac51 100644 --- a/ext/nkf/nkf-utf8/nkf.h +++ b/ext/nkf/nkf-utf8/nkf.h @@ -1,8 +1,8 @@ /* - * + * * nkf.h - Header file for nkf * - * $Id: nkf.h,v 1.6 2008/11/07 02:43:43 naruse Exp $ + * $Id$ */ #ifndef NKF_H diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb index d4a5171905..9aab728e99 100644 --- a/ext/psych/lib/psych.rb +++ b/ext/psych/lib/psych.rb @@ -18,8 +18,8 @@ require 'psych/handlers/document_stream' ### # = Overview # -# Psych is a YAML parser and emitter. -# Psych leverages libyaml [Home page: http://pyyaml.org/wiki/LibYAML] +# Psych is a YAML parser and emitter. +# Psych leverages libyaml [Home page: http://pyyaml.org/wiki/LibYAML] # or [Git repo: https://github.com/zerotao/libyaml] for its YAML parsing # and emitting capabilities. In addition to wrapping libyaml, Psych also # knows how to serialize and de-serialize most Ruby objects to and from diff --git a/ext/psych/yaml/emitter.c b/ext/psych/yaml/emitter.c index f41a8fada6..c852f9309f 100644 --- a/ext/psych/yaml/emitter.c +++ b/ext/psych/yaml/emitter.c @@ -517,7 +517,7 @@ yaml_emitter_emit_stream_start(yaml_emitter_t *emitter, if (emitter->best_width < 0) { emitter->best_width = INT_MAX; } - + if (!emitter->line_break) { emitter->line_break = YAML_LN_BREAK; } @@ -607,7 +607,7 @@ yaml_emitter_emit_document_start(yaml_emitter_t *emitter, if (!yaml_emitter_write_indent(emitter)) return 0; } - + if (event->data.document_start.tag_directives.start != event->data.document_start.tag_directives.end) { implicit = 0; @@ -721,7 +721,7 @@ yaml_emitter_emit_document_end(yaml_emitter_t *emitter, } /* - * + * * Expect a flow item node. */ @@ -1402,7 +1402,7 @@ yaml_emitter_analyze_anchor(yaml_emitter_t *emitter, { size_t anchor_length; yaml_string_t string; - + anchor_length = strlen((char *)anchor); STRING_ASSIGN(string, anchor, anchor_length); diff --git a/ext/psych/yaml/parser.c b/ext/psych/yaml/parser.c index eb2a2c792b..dc5430b09f 100644 --- a/ext/psych/yaml/parser.c +++ b/ext/psych/yaml/parser.c @@ -1295,7 +1295,7 @@ yaml_parser_process_directives(yaml_parser_t *parser, token = PEEK_TOKEN(parser); if (!token) goto error; } - + for (default_tag_directive = default_tag_directives; default_tag_directive->handle; default_tag_directive++) { if (!yaml_parser_append_tag_directive(parser, *default_tag_directive, 1, diff --git a/ext/psych/yaml/reader.c b/ext/psych/yaml/reader.c index 829e32da55..4e48add7b8 100644 --- a/ext/psych/yaml/reader.c +++ b/ext/psych/yaml/reader.c @@ -52,7 +52,7 @@ yaml_parser_determine_encoding(yaml_parser_t *parser) { /* Ensure that we had enough bytes in the raw buffer. */ - while (!parser->eof + while (!parser->eof && parser->raw_buffer.last - parser->raw_buffer.pointer < 3) { if (!yaml_parser_update_raw_buffer(parser)) { return 0; @@ -295,7 +295,7 @@ yaml_parser_update_buffer(yaml_parser_t *parser, size_t length) parser->offset, value); break; - + case YAML_UTF16LE_ENCODING: case YAML_UTF16BE_ENCODING: @@ -318,7 +318,7 @@ yaml_parser_update_buffer(yaml_parser_t *parser, size_t length) * * The following formulas are used for decoding * and encoding characters using surrogate pairs: - * + * * U = U' + 0x10000 (0x01 00 00 <= U <= 0x10 FF FF) * U' = yyyyyyyyyyxxxxxxxxxx (0 <= U' <= 0x0F FF FF) * W1 = 110110yyyyyyyyyy diff --git a/ext/psych/yaml/scanner.c b/ext/psych/yaml/scanner.c index a2e8619264..f7a305de8f 100644 --- a/ext/psych/yaml/scanner.c +++ b/ext/psych/yaml/scanner.c @@ -762,7 +762,7 @@ yaml_parser_scan(yaml_parser_t *parser, yaml_token_t *token) } /* Fetch the next token from the queue. */ - + *token = DEQUEUE(parser, parser->tokens); parser->token_available = 0; parser->tokens_parsed ++; @@ -1121,7 +1121,7 @@ yaml_parser_save_simple_key(yaml_parser_t *parser) yaml_simple_key_t simple_key; simple_key.possible = 1; simple_key.required = required; - simple_key.token_number = + simple_key.token_number = parser->tokens_parsed + (parser->tokens.tail - parser->tokens.head); simple_key.mark = parser->mark; @@ -1202,7 +1202,7 @@ yaml_parser_decrease_flow_level(yaml_parser_t *parser) * Push the current indentation level to the stack and set the new level * the current column is greater than the indentation level. In this case, * append or insert the specified token into the token queue. - * + * */ static int @@ -1935,7 +1935,7 @@ yaml_parser_scan_to_next_token(yaml_parser_t *parser) * * - in the flow context; * - in the block context, but not at the beginning of the line or - * after '-', '?', or ':' (complex value). + * after '-', '?', or ':' (complex value). */ if (!CACHE(parser, 1)) return 0; @@ -3001,7 +3001,7 @@ yaml_parser_scan_block_scalar_breaks(yaml_parser_t *parser, *indent = 1; } - return 1; + return 1; } /* diff --git a/ext/psych/yaml/writer.c b/ext/psych/yaml/writer.c index b90019f5cb..5d57f392f1 100644 --- a/ext/psych/yaml/writer.c +++ b/ext/psych/yaml/writer.c @@ -74,7 +74,7 @@ yaml_emitter_flush(yaml_emitter_t *emitter) unsigned int value; size_t k; - /* + /* * See the "reader.c" code for more details on UTF-8 encoding. Note * that we assume that the buffer contains a valid UTF-8 sequence. */ diff --git a/ext/psych/yaml/yaml.h b/ext/psych/yaml/yaml.h index 5a04d36d41..acd72ad3a3 100644 --- a/ext/psych/yaml/yaml.h +++ b/ext/psych/yaml/yaml.h @@ -1,7 +1,7 @@ /** * @file yaml.h * @brief Public interface for libyaml. - * + * * Include the header file with the code: * @code * #include <yaml.h> @@ -388,7 +388,7 @@ typedef struct yaml_event_s { /** The event data. */ union { - + /** The stream parameters (for @c YAML_STREAM_START_EVENT). */ struct { /** The document encoding. */ @@ -724,7 +724,7 @@ struct yaml_node_s { /** The node data. */ union { - + /** The scalar parameters (for @c YAML_SCALAR_NODE). */ struct { /** The scalar value. */ diff --git a/ext/psych/yaml/yaml_private.h b/ext/psych/yaml/yaml_private.h index 2b3e0744d1..af10c83973 100644 --- a/ext/psych/yaml/yaml_private.h +++ b/ext/psych/yaml/yaml_private.h @@ -231,9 +231,9 @@ yaml_string_join( (string).pointer[offset] <= (yaml_char_t) 'f') ? \ ((string).pointer[offset] - (yaml_char_t) 'a' + 10) : \ ((string).pointer[offset] - (yaml_char_t) '0')) - + #define AS_HEX(string) AS_HEX_AT((string),0) - + /* * Check if the character is ASCII. */ |