7edc9bedd9a2d5d48ff44303c46e8006df2d343c kent Wed Feb 4 09:10:56 2015 -0800 Removing INLINE from raNextTagVal since it was causeing compile problems. diff --git src/inc/ra.h src/inc/ra.h index 4e5a021..83333bc 100644 --- src/inc/ra.h +++ src/inc/ra.h @@ -29,39 +29,36 @@ // 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 raNextTagValWithIndent(struct lineFile *lf, char **retTag, char **retVal, struct dyString *dy, int *retIndent); // Read next line. Return FALSE at end of file or blank line. Otherwise fill in // *retTag and *retVal and *retIndent 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. // NOTE: retTag & retVal, if returned, point to static mem which will be overwritten on next call! -INLINE boolean raNextTagVal(struct lineFile *lf, char **retTag, char **retVal, struct dyString *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. // NOTE: retTag & retVal, if returned, point to static mem which will be overwritten on next call! -{ -return raNextTagValWithIndent(lf, retTag, retVal, dy, NULL); -} 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. */ void raFoldIn(char *fileName, struct hash *hashOfHash); /* Read ra's in file name and fold them into hashOfHash. * This will add ra's and ra fields to whatever already * exists in the hashOfHash, overriding fields of the