← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ruby1.9.1/quantal

« back to all changes in this revision

Viewing changes to ext/syck/handler.c

  • Committer: Bazaar Package Importer
  • Author(s): Lucas Nussbaum
  • Date: 2010-07-31 17:08:39 UTC
  • mfrom: (1.1.4 upstream) (8.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20100731170839-j034dmpdqt1cc4p6
Tags: 1.9.2~svn28788-1
http://bugs.debian.org/580852
http://bugs.debian.org/590002
http://bugs.debian.org/543805
http://bugs.debian.org/542927
* New release based on upstream snapshot from the 1.9.2 branch,
  after 1.9.2 RC2. That branch is (supposed to be) binary-compatible
  with the 1.9.1 branch.
  + Builds fine on i386. Closes: #580852.
* Upgrade to Standards-Version: 3.9.1. No changes needed.
* Updated generated incs.
* Patches that still need work:
  + Unclear status, need more investigation:
   090729_fix_Makefile_deps.dpatch
   090803_exclude_rdoc.dpatch
   203_adjust_base_of_search_path.dpatch
   902_define_YAML_in_yaml_stringio.rb.dpatch
   919_common.mk_tweaks.dpatch
   931_libruby_suffix.dpatch
   940_test_thread_mutex_sync_shorter.dpatch
  + Maybe not needed anymore, keeping but not applying.
   102_skip_test_copy_stream.dpatch (test doesn't block anymore?)
   104_skip_btest_io.dpatch (test doesn't block anymore?)
   201_gem_prelude.dpatch (we don't use that rubygems anyway?)
   202_gem_default_dir.dpatch (we don't use that rubygems anyway?)
   940_test_file_exhaustive_fails_as_root.dpatch
   940_test_priority_fails.dpatch
   100518_load_libc_libm.dpatch
* Add disable-tests.diff: disable some tests that cause failures on FreeBSD.
  Closes: #590002, #543805, #542927.
* However, many new failures on FreeBSD. Since that version is still an
  improvement, add the check that makes test suite failures non-fatal on
  FreeBSD again. That still needs to be investigated.
* Re-add 903_skip_base_ruby_check.dpatch
* Add build-dependency on ruby1.8 and drop all pre-generated files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/syck/handler.c
9
9
#include "ruby/ruby.h"
10
10
#include "syck.h"
11
11
 
12
 
SYMID 
 
12
SYMID
13
13
syck_hdlr_add_node( SyckParser *p, SyckNode *n )
14
14
{
15
15
    SYMID id;
16
16
 
17
 
    if ( ! n->id ) 
 
17
    if ( ! n->id )
18
18
    {
19
19
        n->id = (p->handler)( p, n );
20
20
    }
89
89
        if ( st_lookup( p->anchors, (st_data_t)a, (void *)&n ) )
90
90
        {
91
91
            if ( n != (void *)1 )
92
 
            {    
 
92
            {
93
93
                S_FREE( a );
94
94
                return n;
95
95
            }
116
116
    if ( n->anchor )
117
117
    {
118
118
        S_FREE( a );
119
 
    } 
 
119
    }
120
120
    else
121
121
    {
122
122
        n->anchor = a;
165
165
    return uri;
166
166
}
167
167
 
168
 
int 
 
168
int
169
169
syck_try_implicit( SyckNode *n )
170
170
{
171
171
    return 1;