gh-mirrors/openwrt-packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-10 12:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

libcli: fix compilation with GCC14

Browse Source 
GCC 14 does not like 1 as the second parameter to calloc.

Clean up definition to avoid using PKG_SOURCE_DATE and to just use
PKG_VERSION.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2024-05-14 17:15:39 -07:00
parent d5f9a76aa4
commit f9dfeaad4a
2 changed files with 100 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libs/libcli/Makefile
View File

@@ -5,12 +5,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libcli
PKG_VERSION:=1.10.7
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=https://github.com/dparrish/libcli.git
PKG_SOURCE_DATE:=2022-07-06
PKG_SOURCE_VERSION:=V1.10.7
PKG_MIRROR_HASH:=ee686c27f80317680d151423b621ed0643992e28f6b5be2caca28318a25fe98c
PKG_SOURCE_VERSION:=V$(PKG_VERSION)
PKG_SOURCE_URL=https://github.com/dparrish/libcli
PKG_MIRROR_HASH:=a9842266ae80f78b838f71c98bbfeed6c7082fadedd2d9a301aedc3e47a88af7
PKG_MAINTAINER:=Martin Blumenstingl <martin.blumenstingl@googlemail.com>
PKG_LICENSE:=LGPL-2.1
@@ -25,7 +25,6 @@ define Package/libcli
CATEGORY:=Libraries
TITLE:=libcli
URL:=https://dparrish.com/link/libcli
DEPENDS:=+libc
endef
define Package/libcli/description

96
libs/libcli/patches/010-gcc14.patch Normal file
View File

@@ -0,0 +1,96 @@
--- a/libcli.c
+++ b/libcli.c
@@ -427,7 +427,7 @@ struct cli_command *cli_register_command
struct cli_command *c;
if (!command) return NULL;
- if (!(c = calloc(sizeof(struct cli_command), 1))) return NULL;
+ if (!(c = calloc(1, sizeof(struct cli_command)))) return NULL;
c->command_type = CLI_REGULAR_COMMAND;
c->callback = callback;
c->next = NULL;
@@ -597,10 +597,10 @@ struct cli_def *cli_init() {
struct cli_def *cli;
struct cli_command *c;
- if (!(cli = calloc(sizeof(struct cli_def), 1))) return 0;
+ if (!(cli = calloc(1, sizeof(struct cli_def)))) return 0;
cli->buf_size = 1024;
- if (!(cli->buffer = calloc(cli->buf_size, 1))) {
+ if (!(cli->buffer = calloc(1, cli->buf_size))) {
cli_done(cli);
return 0;
}
@@ -778,7 +778,7 @@ static char *cli_int_return_newword(cons
// allocate space (including terminal NULL, then go through and deal with escaping characters as we copy them
- if (!(newword = calloc(len + 1, 1))) return 0;
+ if (!(newword = calloc(1, len + 1))) return 0;
to = newword;
while (start != end) {
if (*start == '\\')
@@ -1940,7 +1940,7 @@ int cli_match_filter_init(struct cli_def
char *search_flags = cli_get_optarg_value(cli, "search_flags", NULL);
filt->filter = cli_match_filter;
- filt->data = state = calloc(sizeof(struct cli_match_filter_state), 1);
+ filt->data = state = calloc(1, sizeof(struct cli_match_filter_state));
if (!state) return CLI_ERROR;
if (!strcmp(cli->pipeline->current_stage->words[0], "include")) {
@@ -2033,7 +2033,7 @@ int cli_range_filter_init(struct cli_def
// from the command line processing and continue
filt->filter = cli_range_filter;
- filt->data = state = calloc(sizeof(struct cli_range_filter_state), 1);
+ filt->data = state = calloc(1, sizeof(struct cli_range_filter_state));
if (state) {
state->from = from;
state->to = to;
@@ -2070,7 +2070,7 @@ int cli_count_filter_init(struct cli_def
}
filt->filter = cli_count_filter;
- if (!(filt->data = calloc(sizeof(int), 1))) return CLI_ERROR;
+ if (!(filt->data = calloc(1, sizeof(int)))) return CLI_ERROR;
return CLI_OK;
}
@@ -2127,7 +2127,7 @@ struct cli_command *cli_register_filter(
struct cli_command *c;
if (!command) return NULL;
- if (!(c = calloc(sizeof(struct cli_command), 1))) return NULL;
+ if (!(c = calloc(1, sizeof(struct cli_command)))) return NULL;
c->command_type = CLI_FILTER_COMMAND;
c->init = init;
@@ -2239,7 +2239,7 @@ struct cli_optarg *cli_register_optarg(s
goto CLEANUP;
}
}
- if (!(optarg = calloc(sizeof(struct cli_optarg), 1))) goto CLEANUP;
+ if (!(optarg = calloc(1, sizeof(struct cli_optarg)))) goto CLEANUP;
if (!(optarg->name = strdup(name))) goto CLEANUP;
if (help && !(optarg->help = strdup(help))) goto CLEANUP;
@@ -2505,7 +2505,7 @@ struct cli_command *cli_int_register_bui
struct cli_command *c;
if (!command) return NULL;
- if (!(c = calloc(sizeof(struct cli_command), 1))) return NULL;
+ if (!(c = calloc(1, sizeof(struct cli_command)))) return NULL;
c->flags = flags;
c->callback = callback;
@@ -3068,7 +3068,7 @@ int cli_int_execute_pipeline(struct cli_
struct cli_pipeline_stage *stage = &pipeline->stage[stage_num];
pipeline->current_stage = stage;
cli->found_optargs = stage->found_optargs;
- *filt = calloc(sizeof(struct cli_filter), 1);
+ *filt = calloc(1, sizeof(struct cli_filter));
if (*filt) {
if ((rc = stage->command->init(cli, stage->num_words, stage->words, *filt) != CLI_OK)) {
break;