diff options
author | humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-14 16:27:30 +0000 |
---|---|---|
committer | humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-14 16:27:30 +0000 |
commit | bdecb68a2bc6e6a04cf446f1e75731bac2f8446b (patch) | |
tree | 7e6c7655b0dfa77a819f3c96b0bcd26401444a73 /include/utils | |
parent | 7388051d745590d7759e7ed49c233caec6bea0f7 (diff) |
handle configuration variables longer than 30 characters long
BUG=
R=bsalomon@google.com, halcanary@google.com, reed@google.com
Review URL: https://codereview.chromium.org/26206003
git-svn-id: http://skia.googlecode.com/svn/trunk@11757 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/utils')
-rw-r--r-- | include/utils/SkRTConf.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/include/utils/SkRTConf.h b/include/utils/SkRTConf.h index 1dc41c9799..91993d83be 100644 --- a/include/utils/SkRTConf.h +++ b/include/utils/SkRTConf.h @@ -111,10 +111,18 @@ SkRTConf<T>::SkRTConf(const char *name, const T &defaultValue, const char *descr template<typename T> void SkRTConf<T>::print(SkWStream *o) const { char outline[200]; // should be ok because we specify a max. width for everything here. - - sprintf(outline, "%-30.30s", getName()); - doPrint(&(outline[30])); - sprintf(&(outline[60]), " %.128s", fDescription.c_str()); + char *outptr; + if (strlen(getName()) >= 30) { + o->writeText(getName()); + o->writeText(" "); + outptr = &(outline[0]); + } else { + sprintf(outline, "%-30.30s", getName()); + outptr = &(outline[30]); + } + + doPrint(outptr); + sprintf(outptr+30, " %.128s", fDescription.c_str()); for (size_t i = strlen(outline); i --> 0 && ' ' == outline[i];) { outline[i] = '\0'; } |