2f86a7aa428f02d8602444014985c56614030f5f angie Fri Nov 22 08:52:31 2013 -0800 Fixing ridiculous uninitialized use error found by Hiram and new Mac gcc.refs #12209 diff --git src/lib/annoOption.c src/lib/annoOption.c index 351d47c..5faa66a 100644 --- src/lib/annoOption.c +++ src/lib/annoOption.c @@ -1,29 +1,29 @@ /* annoOption -- optionSpec-style param plus its value */ #include "annoOption.h" struct annoOption *annoOptionCloneList(struct annoOption *list) /* Return a newly allocated copy of list. */ { struct annoOption *newList = NULL, *afo; for (afo = list; afo != NULL; afo = afo->next) { struct annoOption *newAfo = CloneVar(afo); newAfo->spec.name = cloneString(afo->spec.name); newAfo->value = NULL; - unsigned opFlags = opFlags; + unsigned opFlags = afo->spec.flags; if (opFlags & OPTION_MULTI) { switch (opFlags & OPTION_TYPE_MASK) { case OPTION_STRING: newAfo->value = slNameCloneList((struct slName *)(afo->value)); break; default: errAbort("annoOptionCloneList: OPTION_MULTI implemented only for " "OPTION_STRING (not 0x%x)", opFlags); } } else { switch (opFlags & OPTION_TYPE_MASK) @@ -47,31 +47,31 @@ } slReverse(&newList); return newList; } void annoOptionFreeList(struct annoOption **pList) /* Free the same things that we clone above. */ { if (pList == NULL) return; struct annoOption *afo, *nextAfo; for (afo = *pList; afo != NULL; afo = nextAfo) { nextAfo = afo->next; freeMem(afo->spec.name); - unsigned opFlags = opFlags; + unsigned opFlags = afo->spec.flags; if (opFlags & OPTION_MULTI) { switch (opFlags & OPTION_TYPE_MASK) { case OPTION_STRING: slNameFreeList(&(afo->value)); break; default: errAbort("annoOptionFreeList: OPTION_MULTI implemented only for " "OPTION_STRING (not 0x%x)", opFlags); } } else { switch (opFlags & OPTION_TYPE_MASK)