Convert addReccasterEnvVars to linked list and create helper function for addReccaster* logic #120
Conversation
client/castApp/src/castinit.c
Outdated
| * itemDesc is string to describe what is being added (for error messages) | ||
| * defaultArray is an optional arg for a default list to also check for duplicates | ||
| */ | ||
| static void addToReccasterLinkedList(caster_t* self, int argc, char **argv, ELLLIST* list, const char* funcName, const char* itemDesc, const char** defaultArray) |
There was a problem hiding this comment.
I can see why this signature is used, although I don't love it.
One thought that might clean up a bunch of the code and improve this: at the moment for the default_env array we treat this as separate from the defined ones. Why not start the caster initialisation with the default array? That is, we could actually start with
addToReccasterLinkedList(caster, count default_env_vars, addReccasterEnvVars", "Default Environment variable");or something like that. This would allow you to get rid of the last argument as well as the if(defaultArray) block.
There was a problem hiding this comment.
That is a good idea. I went ahead and renamed the extra_envs linked list to just envs and it now contains all the defaults and any user added env vars. Wondering if I need to grab the lock in casterInit before modifying self->envs to add the defaults?
Also moved the argc/argv stuff back to the original functions and re-named the args to addToReccasterLinkedList to make it more generic. Does that make sense? should any other code be pulled out of addToReccasterLinkedList?
|
3 participants
This PR is in place of #117 so the git merging/commit history isn't messed up. I branched off the latest in master, cherry-picked @madelinespark 's two commits, and worked off that.
addReccasterEnvVarsandaddReccasterExcludePatternlogicIOCSHFUNCDEF_HAS_USAGEmessage foraddReccasterExcludePatternMadeline's commits already converted
addReccasterEnvVarsto a linked list implementation and updated all the unit tests.