Changeset 23859

Timestamp:

Apr 14, 2009, 2:12:00 PM (17 years ago)

Author:

Paul Price

Message:

There's no reason why multiple '@' characters can't appear on the same line: in the value or comment.

File:

• trunk/psLib/src/types/psMetadataConfig.c (modified) (2 diffs)

trunk/psLib/src/types/psMetadataConfig.c

@@ -180 +180 @@
 
     return cleaned;
-}
-
-// Count repeat occurances of a single character within a line. The input string must be null terminated.
-static psS32 repeatedChars(char *inString,
-                           char ch)
-{
-    psS32 count = 0;
-
-    while(*inString!='\0') {
-        if(*inString == ch) {
-            count++;
-        }
-        inString++;
-    }
-
-    return count;
 }
 
@@ -1071 +1055 @@
     *notBlank = true;
 
-    // Check for more than one '@' in a line
-    // XXX this logic is wrong -- there's no reason a @ can't appear in a
-    // comment
-    if (repeatedChars(linePtr, '@') > 1) {
-        psError(PS_ERR_IO, true,
-                _("More than one '@' character is not allowed"));
-        return false;
-    }
-
     // Get metadata item name
     psS32               status = 0;