← Back to branch summary

~ubuntu-branches/ubuntu/lucid/php5/lucid

« back to all changes in this revision

Viewing changes to ext/intl/grapheme/grapheme_string.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-03-16 09:09:50 UTC
  • mfrom: (1.1.18 upstream) (0.3.10 sid)
  • Revision ID: james.westby@ubuntu.com-20100316090950-e36m0pzranoixifd
Tags: 5.3.2-1ubuntu1
* Merge from debian unstable: 
  - debian/control:
    * Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe.
    * Dropped libmysqlclient15-dev, build against mysql 5.1.
    * Dropped libcurl-dev not in the archive.
    * Suggest php5-suhosin rather than recommends.
    * Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions already in
      universe.
    * Dropped libonig-dev and libqgdbm since its in universe. (will be re-added in lucid+1)
    * Dropped locales-all.
  - modulelist: Drop imap, interbase, and mcrypt.
  - debian/rules:
    * Dropped building of mcrypt, imap, and interbase.
    * Install apport hook for php5.
  - Dropped debian/patches/libedit_is_editline.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/intl/grapheme/grapheme_string.c
83
83
                intl_error_set_code( NULL, status TSRMLS_CC );
84
84
 
85
85
                /* Set error messages. */
86
 
                intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 1 TSRMLS_CC );
 
86
                intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 0 TSRMLS_CC );
87
87
                efree( ustring );
88
88
                RETURN_NULL();
89
89
        }
446
446
                intl_error_set_code( NULL, status TSRMLS_CC );
447
447
 
448
448
                /* Set error messages. */
449
 
                intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 1 TSRMLS_CC );
 
449
                intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 0 TSRMLS_CC );
450
450
                efree( ustr );
451
451
                RETURN_FALSE;
452
452
        }
507
507
                        intl_error_set_code( NULL, status TSRMLS_CC );
508
508
 
509
509
                        /* Set error messages. */
510
 
                        intl_error_set_custom_msg( NULL, "Error converting output string to UTF-8", 1 TSRMLS_CC );
 
510
                        intl_error_set_custom_msg( NULL, "Error converting output string to UTF-8", 0 TSRMLS_CC );
511
511
 
512
512
                        efree( sub_str );
513
513
 
563
563
                intl_error_set_code( NULL, status TSRMLS_CC );
564
564
 
565
565
                /* Set error messages. */
566
 
                intl_error_set_custom_msg( NULL, "Error converting output string to UTF-8", 1 TSRMLS_CC );
 
566
                intl_error_set_custom_msg( NULL, "Error converting output string to UTF-8", 0 TSRMLS_CC );
567
567
 
568
568
                if ( NULL != sub_str )
569
569
                        efree( sub_str );
870
870
                intl_error_set_code( NULL, status TSRMLS_CC );
871
871
 
872
872
                /* Set error messages. */
873
 
                intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 1 TSRMLS_CC );
 
873
                intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 0 TSRMLS_CC );
874
874
 
875
875
                if ( NULL != ustr )
876
876
                        efree( ustr );