Skip to content

Commit f0ab015

Browse files
nouwaaromdiasbruno
andcommitted
misc: Apply suggestions from code review
Co-authored-by: Bruno Dias <dias.h.bruno@gmail.com>
1 parent 4f9d33a commit f0ab015

6 files changed

+10
-7
lines changed

src/clib-install.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ static int install_package(const char *slug) {
281281
char* author = clib_package_parse_author(slug);
282282
char* name = clib_package_parse_name(slug);
283283
char* package_id = clib_package_get_id(author, name);
284-
registry_package_ptr_t package_info = registry_manger_find_package(registries, package_id);
284+
registry_package_ptr_t package_info = registry_manager_find_package(registries, package_id);
285285
if (!package_info) {
286286
debug(&debugger, "Package %s not found in any registry.", slug);
287287
return -1;

src/common/clib-package-installer.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ static inline int install_packages(list_t *list, const char *dir, int verbose) {
8888
if (NULL == slug)
8989
goto loop_cleanup;
9090

91-
registry_package_ptr_t package_info = registry_manger_find_package(registries, package_id);
91+
registry_package_ptr_t package_info = registry_manager_find_package(registries, package_id);
9292
if (!package_info) {
9393
debug(&_debugger, "Package %s not found in any registry.", slug);
9494
return -1;

src/registry/github-registry.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,16 @@
1818
#include <curl/curl.h>
1919
#include <string.h>
2020

21+
#define GITHUB_BASE_URL "https://github.com/"
22+
2123
/**
2224
* Add `href` to the given `package`.
2325
*/
2426
static void add_package_href(registry_package_ptr_t self) {
2527
size_t len = strlen(self->id) + 20; // https://github.com/ \0
2628
self->href = malloc(len);
2729
if (self->href)
28-
sprintf(self->href, "https://github.com/%s", self->id);
30+
sprintf(self->href, GITHUB_BASE_URL "%s", self->id);
2931
}
3032

3133
/**
@@ -129,4 +131,3 @@ list_t *github_registry_fetch(const char *url) {
129131
http_get_free(res);
130132
return list;
131133
}
132-

src/registry/registry-manager.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void registry_manager_fetch_registries(registries_t registries) {
4848
registry_iterator_destroy(it);
4949
}
5050

51-
registry_package_ptr_t registry_manger_find_package(registries_t registries, const char* package_id) {
51+
registry_package_ptr_t registry_manager_find_package(registries_t registries, const char* package_id) {
5252
registry_iterator_t it = registry_iterator_new(registries);
5353
registry_ptr_t reg;
5454
while ((reg = registry_iterator_next(it))) {

src/registry/registry-manager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ void registry_iterator_destroy(registry_iterator_t iterator);
3939
* @param package_id the identifier of the package "<namespace>/<package_name>"
4040
* @return a pointer to the package if it could be found or NULL
4141
*/
42-
registry_package_ptr_t registry_manger_find_package(registries_t registries, const char* package_id);
42+
registry_package_ptr_t registry_manager_find_package(registries_t registries, const char* package_id);
4343

4444
#endif//CLIB_SRC_REGISTRY_REGISTRY_MANAGER_H

src/repository/gitlab-repository.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@
1010
#include <string.h>
1111
#include <url/url.h>
1212

13+
#define GITLAB_API_V4_URL "https://%s/api/v4%s/repository/files/%s/raw?ref=master"
14+
1315
// GET :hostname/api/v4/projects/:id/repository/files/:file_path/raw
1416
char* gitlab_repository_get_url_for_file(const char*package_url, const char* slug, const char* version, const char *file, const char* secret) {
1517
url_data_t *parsed = url_parse(package_url);
1618

1719
int size = strlen(parsed->hostname) + strlen(parsed->pathname) + strlen(file) + 64;
1820
char *url = malloc(size);
1921
if (url) {
20-
snprintf(url, size, "https://%s/api/v4%s/repository/files/%s/raw?ref=master", parsed->hostname, parsed->pathname, file);
22+
snprintf(url, size, GITLAB_API_V4_URL, parsed->hostname, parsed->pathname, file);
2123
}
2224

2325
url_free(parsed);

0 commit comments

Comments
 (0)