[kamailio/kamailio] p_usrloc: use a global all_columns variable in db_load* functions (PR #3845)
<!-- Kamailio Pull Request Template -->
<!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -->
#### Pre-Submission Checklist <!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply --> <!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above--> <!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list --> - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist: <!-- Go over all points below, and after creating the PR, tick the checkboxes that apply --> - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description <!-- Describe your changes in detail -->
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3845
-- Commit Summary --
* p_usrloc: use a global all_columns variable in db_load* functions
-- File Changes --
M src/modules/p_usrloc/udomain.c (157)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3845.patch https://github.com/kamailio/kamailio/pull/3845.diff
Looks good to me. It similar code is used in usrloc udomain.c, the same refactoring could be of course also done there.
Thank you Henning, let's see if there are other comments.
If the array is used only in that file, I would suggest to make it static and maybe it would be also good rename it to p_usrloc_columns (or similar) to have the module prefix in the name, being a global variable.
@lbalaceanu pushed 1 commit.
9ec5eaa88dd8f4146430429c6cb6aa086063d4ef p_usrloc: use a global all_columns variable in db_load* functions
Thank you for the comments, I made the static and renaming changes.
Hi @miconda,
Do I "Squash and merge" or "Rebase and merge" this PR? Do you consider worthwhile to do a similar PR for usrloc?
Thank you
Hello, squashing is for combining moro commits of the same PR in a single one (if I haven't gotten it wrong), but here is only one, so rebase and merge should do it.
Even with more commits in same PR, rebasing and merge should be done when the commits are sort of independent. Squashing would be suitable when a commit amends another one (e.g., fixing fomratting of a previous commit).
Merged #3845 into master.
I think it would be also a good addition for the usrloc module. It certainly makes the code better understandable (some integer IDs vs. easy names).
Hi @henningw,
Will make a similar PR for usrloc.
Thank you
-
Daniel-Constantin Mierla -
Henning Westerholt
-
Lucian Balaceanu