← Back to branch summary

~ubuntu-branches/ubuntu/precise/libx11/precise-updates

« back to all changes in this revision

Viewing changes to src/xlibi18n/lcFile.c

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2011-04-08 19:04:53 UTC
  • mfrom: (1.1.13 upstream) (2.1.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110408190453-xvgvdjqp06ta0csm
Tags: 2:1.4.2-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Latin locale.
  - Add Klingon locale.
  - Add 102_double_arrows_Compose.patch: compose keys for double arrows
    (LP: 680143)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/xlibi18n/lcFile.c
685
685
                Xfree(name);
686
686
            continue;
687
687
        }
688
 
        if ((1 + (target_dir ? strlen (target_dir) : 0) +
689
 
             strlen("locale.dir")) < PATH_MAX) {
 
688
        if ((1 + strlen (target_dir) + strlen("locale.dir")) < PATH_MAX) {
690
689
            sprintf(buf, "%s/locale.dir", target_dir);
691
690
            target_name = resolve_name(name, buf, RtoL);
692
691
        }
785
784
                Xfree(name);
786
785
            continue;
787
786
        }
788
 
        if ((1 + (target_dir ? strlen (target_dir) : 0) +
789
 
             strlen("locale.dir")) < PATH_MAX) {
 
787
        if ((1 + strlen (target_dir) + strlen("locale.dir")) < PATH_MAX) {
790
788
            sprintf(buf, "%s/locale.dir", target_dir);
791
789
            target_name = resolve_name(name, buf, RtoL);
792
790
        }