← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-lowlatency/quantal

« back to all changes in this revision

Viewing changes to tools/perf/util/strbuf.c

  • Committer: Package Import Robot
  • Author(s): Luke Yelavich, Luke Yelavich, Upstream Kernel Changes
  • Date: 2012-03-30 09:03:19 UTC
  • Revision ID: package-import@ubuntu.com-20120330090319-5445yb1865swhoiv
Tags: 3.2.0-21.29
[ Luke Yelavich ]

* [Config] Update configs after rebase against Ubuntu-3.2.0-21.34

[ Upstream Kernel Changes ]

* Low-latency: Rebase against Ubuntu-3.2.0-21.34

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/perf/util/strbuf.c
1
1
#include "cache.h"
 
2
#include <linux/kernel.h>
2
3
 
3
4
int prefixcmp(const char *str, const char *prefix)
4
5
{
89
90
        if (!strbuf_avail(sb))
90
91
                strbuf_grow(sb, 64);
91
92
        va_start(ap, fmt);
92
 
        len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
 
93
        len = vscnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
93
94
        va_end(ap);
94
95
        if (len < 0)
95
 
                die("your vsnprintf is broken");
 
96
                die("your vscnprintf is broken");
96
97
        if (len > strbuf_avail(sb)) {
97
98
                strbuf_grow(sb, len);
98
99
                va_start(ap, fmt);
99
 
                len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
 
100
                len = vscnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
100
101
                va_end(ap);
101
102
                if (len > strbuf_avail(sb)) {
102
103
                        die("this should not happen, your snprintf is broken");