981ef07d25e4560559dae28d3e316913569944d7 tdreszer Fri Jul 6 17:51:06 2012 -0700 Next batch of many checkins as dictated by Jim. Formatting space after if and limiting lines to 100 chars. Changes limited to lines last touched by tdreszer (git blame) so as not to ruin history. None of these changes should affect executables in any way. diff --git src/hg/inc/cart.h src/hg/inc/cart.h index 0bda905..8c31e93 100644 --- src/hg/inc/cart.h +++ src/hg/inc/cart.h @@ -465,94 +465,106 @@ struct hash *oldVars, char *actionVar); /* Load settings (cartDump output) into current session, and then * reload the CGI settings (to support override of session settings). * If non-NULL, oldVars will contain values overloaded when reloading CGI. * If non-NULL, actionVar is a cartRemove wildcard string specifying the * CGI action variable that sent us here. */ char *cartGetOrderFromFile(char *genomeDb, struct cart *cart, char *speciesUseFile); /* Look in a cart variable that holds the filename that has a list of * species to show in a maf file */ char *cartGetOrderFromFileAndMsaTable(char *genomeDb, struct cart *cart, char *speciesUseFile, char *msaTable); /* Look in a cart variable that holds the filename that has a list of * species to show in a maf file */ -char *cartLookUpVariableClosestToHome(struct cart *cart, struct trackDb *tdb, boolean parentLevel, char *suffix,char **pVariable); +char *cartLookUpVariableClosestToHome(struct cart *cart, struct trackDb *tdb, + boolean parentLevel, char *suffix,char **pVariable); /* Returns value or NULL for a cart variable from lowest level on up: subtrackName.suffix, then compositeName.view.suffix, then compositeName.suffix Optionally fills the non NULL pVariable with the actual name of the variable in the cart */ -#define cartOptionalStringClosestToHome(cart,tdb,parentLevel,suffix) cartLookUpVariableClosestToHome((cart),(tdb),(parentLevel),(suffix),NULL) +#define cartOptionalStringClosestToHome(cart,tdb,parentLevel,suffix) \ + cartLookUpVariableClosestToHome((cart),(tdb),(parentLevel),(suffix),NULL) -void cartRemoveVariableClosestToHome(struct cart *cart, struct trackDb *tdb, boolean parentLevel, char *suffix); +void cartRemoveVariableClosestToHome(struct cart *cart, struct trackDb *tdb, + boolean parentLevel, char *suffix); /* Looks for then removes a cart variable from lowest level on up: subtrackName.suffix, then compositeName.view.suffix, then compositeName.suffix */ -char *cartStringClosestToHome(struct cart *cart, struct trackDb *tdb, boolean parentLevel, char *suffix); +char *cartStringClosestToHome(struct cart *cart, struct trackDb *tdb, + boolean parentLevel, char *suffix); /* Returns value or Aborts for a cart string from lowest level on up: subtrackName.suffix, then compositeName.view.suffix, then compositeName.suffix */ -boolean cartVarExistsAnyLevel(struct cart *cart, struct trackDb *tdb, boolean parentLevel, char *suffix); +boolean cartVarExistsAnyLevel(struct cart *cart, struct trackDb *tdb, + boolean parentLevel, char *suffix); /* Returns TRUE if variable exists anywhere, looking from lowest level on up: subtrackName.suffix, then compositeName.view.suffix, then compositeName.suffix */ boolean cartListVarExistsAnyLevel(struct cart *cart, struct trackDb *tdb, boolean parentLevel, char *suffix); /* Return TRUE if a list variable for tdb->track (or tdb->parent->track, * or tdb->parent->parent->track, etc.) is in cart (list itself may be NULL). */ -char *cartUsualStringClosestToHome(struct cart *cart, struct trackDb *tdb, boolean parentLevel, char *suffix, char *usual); +char *cartUsualStringClosestToHome(struct cart *cart, struct trackDb *tdb, boolean parentLevel, + char *suffix, char *usual); /* Returns value or {usual} for a cart string from lowest level on up: subtrackName.suffix, then compositeName.view.suffix, then compositeName.suffix */ -boolean cartBooleanClosestToHome(struct cart *cart, struct trackDb *tdb, boolean parentLevel, char *suffix); +boolean cartBooleanClosestToHome(struct cart *cart, struct trackDb *tdb, + boolean parentLevel, char *suffix); /* Returns value or Aborts for a cart boolean ('on' or != 0) from lowest level on up: subtrackName.suffix, then compositeName.view.suffix, then compositeName.suffix */ -boolean cartUsualBooleanClosestToHome(struct cart *cart, struct trackDb *tdb, boolean parentLevel, char *suffix,boolean usual); +boolean cartUsualBooleanClosestToHome(struct cart *cart, struct trackDb *tdb, + boolean parentLevel, char *suffix,boolean usual); /* Returns value or {usual} for a cart boolean ('on' or != 0) from lowest level on up: subtrackName.suffix, then compositeName.view.suffix, then compositeName.suffix */ -int cartUsualIntClosestToHome(struct cart *cart, struct trackDb *tdb, boolean parentLevel, char *suffix, int usual); +int cartUsualIntClosestToHome(struct cart *cart, struct trackDb *tdb, + boolean parentLevel, char *suffix, int usual); /* Returns value or {usual} for a cart int from lowest level on up: subtrackName.suffix, then compositeName.view.suffix, then compositeName.suffix */ -double cartUsualDoubleClosestToHome(struct cart *cart, struct trackDb *tdb, boolean parentLevel, char *suffix, double usual); +double cartUsualDoubleClosestToHome(struct cart *cart, struct trackDb *tdb, + boolean parentLevel, char *suffix, double usual); /* Returns value or {usual} for a cart fp double from lowest level on up: subtrackName.suffix, then compositeName.view.suffix, then compositeName.suffix */ -struct slName *cartOptionalSlNameListClosestToHome(struct cart *cart, struct trackDb *tdb, boolean parentLevel, char *suffix); +struct slName *cartOptionalSlNameListClosestToHome(struct cart *cart, struct trackDb *tdb, + boolean parentLevel, char *suffix); /* Return slName list (possibly with multiple values for the same var) from lowest level on up: subtrackName.suffix, then compositeName.view.suffix, then compositeName.suffix */ void cartRemoveAllForTdb(struct cart *cart, struct trackDb *tdb); /* Remove all variables from cart that are associated with this tdb. */ void cartRemoveAllForTdbAndChildren(struct cart *cart, struct trackDb *tdb); /* Remove all variables from cart that are associated with this tdb and it's children. */ char *cartOrTdbString(struct cart *cart, struct trackDb *tdb, char *var, char *defaultVal); /* Look first in cart, then in trackDb for var. Return defaultVal if not found. */ int cartOrTdbInt(struct cart *cart, struct trackDb *tdb, char *var, int defaultVal); /* Look first in cart, then in trackDb for var. Return defaultVal if not found. */ double cartOrTdbDouble(struct cart *cart, struct trackDb *tdb, char *var, double defaultVal); /* Look first in cart, then in trackDb for var. Return defaultVal if not found. */ -boolean cartValueHasChanged(struct cart *newCart,struct hash *oldVars,char *setting,boolean ignoreRemoved,boolean ignoreCreated); +boolean cartValueHasChanged(struct cart *newCart,struct hash *oldVars,char *setting, + boolean ignoreRemoved,boolean ignoreCreated); /* Returns TRUE if new cart setting has changed from old cart setting */ int cartRemoveFromTdbTree(struct cart *cart,struct trackDb *tdb,char *suffix,boolean skipParent); /* Removes a 'trackName.suffix' from all tdb descendents (but not parent). If suffix NULL then removes 'trackName' which holds visibility */ boolean cartTdbTreeReshapeIfNeeded(struct cart *cart,struct trackDb *tdbComposite); /* When subtrack vis is set via findTracks, and composite has no cart settings, then fashion composite to match found */ boolean cartTdbTreeCleanupOverrides(struct trackDb *tdb,struct cart *newCart,struct hash *oldVars, struct lm *lm); /* When composite/view settings changes, remove subtrack specific settings Returns TRUE if any cart vars are removed */ #endif /* CART_H */