Trim whitespace from parsed filename in Android v21.

src/ports/SkFontConfigParser_android.cpp

 /*
  * Copyright 2011 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontConfigParser_android.h"
 #include "SkFontMgr_android.h"
 #include "SkStream.h"
@@ skipping 245 matching lines @@
     size_t len = strlen(tag);
     if (MEMEQ("family", tag, len)) {
         family_element_handler(self, attributes);
     } else if (MEMEQ("font", tag, len)) {
         font_element_handler(self, attributes);
     } else if (MEMEQ("alias", tag, len)) {
         alias_element_handler(self, attributes);
     }
 }
 
+static void trim_string(SkString* s) {
+    char* str = s->writable_str();
+    const char* start = str;
+    const char* end = start + s->size();
+    for (; *start == ' ' || *start == '\n'|| *start == '\r' || *start == '\t'; ++start) { }

[djsollen, 2015/05/08 13:56:13]

while I can appreciate the compactness of this it is non-trivial to read.

static bool whitespace_char(const char& c) {
  return *start == ' ' || *start == '\n'|| *start == '\r' || *start == '\t';
}

while (!whitespace_char(*start)) { ++start; }

[bungeman-skia, 2015/05/08 15:05:04]

Done.

+    if (start != end) {
+        for (--end; *end == ' ' || *end == '\n'|| *end == '\r' || *end == '\t'; --end) { }

[djsollen, 2015/05/08 13:56:13]

comment why you need the --end at the begin and end of this if statement.

[bungeman-skia, 2015/05/08 15:05:04]

Done.

+        ++end;
+    }
+    memmove(str, start, end - start);
+    s->resize(end - start);
+}
+
 static void XMLCALL end_element_handler(void* data, const char* tag) {
     FamilyData* self = static_cast<FamilyData*>(data);
     size_t len = strlen(tag);
     if (MEMEQ("family", tag, len)) {
         *self->fFamilies.append() = self->fCurrentFamily.detach();
     } else if (MEMEQ("font", tag, len)) {
         XML_SetCharacterDataHandler(self->fParser, NULL);
+        trim_string(&self->fCurrentFontInfo->fFileName);
     }
 }
 
 } // lmpParser
 
 namespace jbParser {
 
 /**
  * Handler for arbitrary text. This is used to parse the text inside each name
  * or file tag. The resulting strings are put into the fNames or FontFileInfo arrays.
@@ skipping 367 matching lines @@
     const char* tag = fTag.c_str();
 
     // strip off the rightmost "-.*"
     const char* parentTagEnd = strrchr(tag, '-');
     if (parentTagEnd == NULL) {
         return SkLanguage();
     }
     size_t parentTagLen = parentTagEnd - tag;
     return SkLanguage(tag, parentTagLen);
 }