← Back to branch summary

~ubuntu-branches/ubuntu/trusty/eglibc/trusty

« back to all changes in this revision

Viewing changes to stdio-common/vfprintf.c

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2013-01-10 18:39:35 UTC
  • mfrom: (1.5.2) (4.4.24 experimental)
  • Revision ID: package-import@ubuntu.com-20130110183935-afsgfxkmg7wk5eaj
Tags: 2.17-0ubuntu1
https://launchpad.net/bugs/1085342
https://launchpad.net/bugs/613662
* Merge with Debian, bringing in a new upstream and many small fixes:
  - patches/any/cvs-malloc-deadlock.diff: Dropped, merged upstream.
  - patches/ubuntu/lddebug-scopes.diff: Rebase for upstream changes.
  - patches/ubuntu/local-CVE-2012-3406.diff: Rebased against upstream.
  - patches/ubuntu/no-asm-mtune-i686.diff: Fixed in recent binutils.
* This upstream merge fixes a nasty hang in pulseaudio (LP: #1085342)
* Bump MIN_KERNEL_SUPPORTED to 2.6.32 on ARM, now that we no longer
  have to support shonky 2.6.31 kernels on imx51 babbage builders.
* Drop patches/ubuntu/local-disable-nscd-host-caching.diff, as these
  issues were apparently resolved upstream a while ago (LP: #613662)
* Fix the compiled-in bug URL to point to launchpad.net, not Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
stdio-common/vfprintf.c
88
88
 
89
89
# define PUT(F, S, N)   _IO_sputn ((F), (S), (N))
90
90
# define PAD(Padchar) \
91
 
  if (width > 0)                                                              \
92
 
    done_add (_IO_padn (s, (Padchar), width))
 
91
  do {                                                                        \
 
92
    if (width > 0)                                                            \
 
93
      {                                                                       \
 
94
        unsigned int d = _IO_padn (s, (Padchar), width);                      \
 
95
        if (__builtin_expect (d == EOF, 0))                                   \
 
96
          {                                                                   \
 
97
            done = -1;                                                        \
 
98
            goto all_done;                                                    \
 
99
          }                                                                   \
 
100
        done_add (d);                                                         \
 
101
      }                                                                       \
 
102
  } while (0)
93
103
# define PUTC(C, F)     _IO_putc_unlocked (C, F)
94
104
# define ORIENT         if (_IO_vtable_offset (s) == 0 && _IO_fwide (s, -1) != -1)\
95
105
                          return -1
107
117
 
108
118
# define PUT(F, S, N)   _IO_sputn ((F), (S), (N))
109
119
# define PAD(Padchar) \
110
 
  if (width > 0)                                                              \
111
 
    done_add (_IO_wpadn (s, (Padchar), width))
 
120
  do {                                                                        \
 
121
    if (width > 0)                                                            \
 
122
      {                                                                       \
 
123
        unsigned int d = _IO_wpadn (s, (Padchar), width);                     \
 
124
        if (__builtin_expect (d == EOF, 0))                                   \
 
125
          {                                                                   \
 
126
            done = -1;                                                        \
 
127
            goto all_done;                                                    \
 
128
          }                                                                   \
 
129
        done_add (d);                                                         \
 
130
      }                                                                       \
 
131
  } while (0)
112
132
# define PUTC(C, F)     _IO_putwc_unlocked (C, F)
113
133
# define ORIENT         if (_IO_fwide (s, 1) != 1) return -1
114
134