8cec4ba176d633ac375b32125ccebc9a3bdb883f tdreszer Fri Apr 15 22:52:50 2011 -0700 Checked in minor changes from Jim's review. Only think of consequence here is the dyStringLen macro had been using strlen, when the stringSize is part of the structure diff --git src/inc/ra.h src/inc/ra.h index b7b66c0..5d40d0a 100644 --- src/inc/ra.h +++ src/inc/ra.h @@ -28,31 +28,32 @@ // Will join continuation lines, allocating memory as needed. // returns pairs with name=joined line and if joined, // val will contain raw lines '\'s and linefeeds, else val will be NULL. boolean raSkipLeadingEmptyLines(struct lineFile *lf, struct dyString *dy); /* Skip leading empty lines and comments. Returns FALSE at end of file. * Together with raNextTagVal you can construct your own raNextRecord.... * If dy parameter is non-null, then the text parsed gets placed into dy. */ boolean raNextTagVal(struct lineFile *lf, char **retTag, char **retVal, struct dyString *dy); // Read next line. Return FALSE at end of file or blank line. Otherwise fill in // *retTag and *retVal and return TRUE. If dy parameter is non-null, then the text parsed // gets appended to dy. Continuation lines in RA file will be joined to produce tag and val, // but dy will be filled with the unedited multiple lines containing the continuation chars. -boolean raNextTagValUnjoined(struct lineFile *lf, char **retTag, char **retVal, struct dyString *dyRecord); +boolean raNextTagValUnjoined(struct lineFile *lf, char **retTag, char **retVal, + struct dyString *dyRecord); // NOTE: this is the former raNextTagVal routine is ignorant of continuation lines. // It is provided in case older RAs need it. // Read next line. Return FALSE at end of file or blank line. Otherwise // fill in *retTag and *retVal and return TRUE. // If dy parameter is non-null, then the text parsed gets appended to dy. struct hash *raFromString(char *string); /* Return hash of key/value pairs from string. * As above freeHash this when done. */ boolean raFoldInOne(struct lineFile *lf, struct hash *hashOfHash); /* Fold in one record from ra file into hashOfHash. * This will add ra's and ra fields to whatever already * exists in the hashOfHash, overriding fields of the * same name if they exist already. */