src/hg/inc/cart.h 1.46
1.46 2009/08/19 18:16:34 markd
fixed bogus return of value that compiler didn't detected; correct non-kentian indentation
Index: src/hg/inc/cart.h
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/inc/cart.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -b -B -U 4 -r1.45 -r1.46
--- src/hg/inc/cart.h 19 Mar 2009 21:02:34 -0000 1.45
+++ src/hg/inc/cart.h 19 Aug 2009 18:16:34 -0000 1.46
@@ -85,27 +85,27 @@
INLINE boolean cartVarExistsDb(struct cart *cart, char *db, char *var)
/* Return TRUE if variable_$db is in cart. */
{
- return cartVarExists(cart, _cartVarDbName(db, var));
+return cartVarExists(cart, _cartVarDbName(db, var));
}
char *cartString(struct cart *cart, char *var);
/* Return string valued cart variable. */
INLINE char *cartStringDb(struct cart *cart, char *db, char *var)
/* Return string valued cart var_$db. */
{
- return cartString(cart, _cartVarDbName(db, var));
+return cartString(cart, _cartVarDbName(db, var));
}
char *cartOptionalString(struct cart *cart, char *var);
/* Return string valued cart variable or NULL if it doesn't exist. */
INLINE char *cartOptionalStringDb(struct cart *cart, char *db, char *var)
/* Return string valued cart variable_$db or NULL if it doesn't exist. */
{
- return cartOptionalString(cart, _cartVarDbName(db, var));
+return cartOptionalString(cart, _cartVarDbName(db, var));
}
char *cartNonemptyString(struct cart *cart, char *name);
/* Return string value associated with name. Return NULL
@@ -114,18 +114,18 @@
INLINE char *cartNonemptyStringDb(struct cart *cart, char *db, char *name)
/* Return string value associated with name_$db. Return NULL
* if value doesn't exist or if it is pure white space. */
{
- return cartNonemptyString(cart, _cartVarDbName(db, name));
+return cartNonemptyString(cart, _cartVarDbName(db, name));
}
char *cartUsualString(struct cart *cart, char *var, char *usual);
/* Return variable value if it exists or usual if not. */
INLINE char *cartUsualStringDb(struct cart *cart, char *db, char *var, char *usual)
/* Return var_$db value if it exists or usual if not. */
{
- return cartUsualString(cart, _cartVarDbName(db, var), usual);
+return cartUsualString(cart, _cartVarDbName(db, var), usual);
}
char *cartCgiUsualString(struct cart *cart, char *var, char *usual);
/* Look for var in CGI, then in cart, if not found then return usual. */
@@ -143,18 +143,18 @@
INLINE void cartSetStringDb(struct cart *cart, char *db, char *var, char *val)
/* Set string valued cart var_$db. */
{
- return cartSetString(cart, _cartVarDbName(db, var), val);
+cartSetString(cart, _cartVarDbName(db, var), val);
}
int cartInt(struct cart *cart, char *var);
/* Return int valued variable. */
INLINE int cartIntDb(struct cart *cart, char *db, char *var)
/* Return int valued variable_$db. */
{
- return cartInt(cart, _cartVarDbName(db, var));
+return cartInt(cart, _cartVarDbName(db, var));
}
int cartIntExp(struct cart *cart, char *var);
@@ -165,9 +165,9 @@
INLINE int cartUsualIntDb(struct cart *cart, char *db, char *var, int usual)
/* Return variable_$db value if it exists or usual if not. */
{
- return cartUsualInt(cart, _cartVarDbName(db, var), usual);
+return cartUsualInt(cart, _cartVarDbName(db, var), usual);
}
int cartUsualIntClipped(struct cart *cart, char *var, int usual,
int minVal, int maxVal);
@@ -181,27 +181,27 @@
INLINE void cartSetIntDb(struct cart *cart, char *db, char *var, int val)
/* Set integer value for var_$db. */
{
- return cartSetInt(cart, _cartVarDbName(db, var), val);
+cartSetInt(cart, _cartVarDbName(db, var), val);
}
double cartDouble(struct cart *cart, char *var);
/* Return double valued variable. */
INLINE double cartDoubleDb(struct cart *cart, char *db, char *var)
/* Return double valued var_$db. */
{
- return cartDouble(cart, _cartVarDbName(db, var));
+return cartDouble(cart, _cartVarDbName(db, var));
}
double cartUsualDouble(struct cart *cart, char *var, double usual);
/* Return variable value if it exists or usual if not. */
INLINE double cartUsualDoubleDb(struct cart *cart, char *db, char *var, double usual)
/* Return var_$db value if it exists or usual if not. */
{
- return cartUsualDouble(cart, _cartVarDbName(db, var), usual);
+return cartUsualDouble(cart, _cartVarDbName(db, var), usual);
}
double cartCgiUsualDouble(struct cart *cart, char *var, double usual);
/* Look for var in CGI, then in cart, if not found then return usual. */
@@ -211,27 +211,27 @@
INLINE void cartSetDoubleDb(struct cart *cart, char *db, char *var, double val)
/* Set double value for var_$db. */
{
- return cartSetDouble(cart, _cartVarDbName(db, var), val);
+cartSetDouble(cart, _cartVarDbName(db, var), val);
}
boolean cartBoolean(struct cart *cart, char *var);
/* Retrieve cart boolean. */
INLINE boolean cartBooleanDb(struct cart *cart, char *db, char *var)
/* Retrieve cart boolean for var_$db. */
{
- return cartBoolean(cart, _cartVarDbName(db, var));
+return cartBoolean(cart, _cartVarDbName(db, var));
}
boolean cartUsualBoolean(struct cart *cart, char *var, boolean usual);
/* Return variable value if it exists or usual if not. */
INLINE boolean cartUsualBooleanDb(struct cart *cart, char *db, char *var, boolean usual)
/* Return var_$db value if it exists or usual if not. */
{
- return cartUsualBoolean(cart, _cartVarDbName(db, var), usual);
+return cartUsualBoolean(cart, _cartVarDbName(db, var), usual);
}
boolean cartCgiUsualBoolean(struct cart *cart, char *var, boolean usual);
/* Look for var in CGI, then in cart, if not found then return usual. */
@@ -241,9 +241,9 @@
INLINE void cartSetBooleanDb(struct cart *cart, char *db, char *var, boolean val)
/* Set boolean value for $var_db. */
{
- return cartSetBoolean(cart, _cartVarDbName(db, var), val);
+cartSetBoolean(cart, _cartVarDbName(db, var), val);
}
void cartMakeTextVar(struct cart *cart, char *var, char *defaultVal, int charSize);
/* Make a text control filled with value from cart if it exists or