git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 5326969acc0c7e9e3cabca202154e4120c0d2c2f Mon Sep 17 00:00:00 2001
   2 From: Khem Raj <raj.khem@gmail.com>
   3 Date: Tue, 26 Sep 2023 14:52:11 -0700
   4 Subject: [PATCH] Move cr_compress_groupfile outside WITH_LIBMODULEMD
   5
   6 This function is used in code which is not conditional under WITH_LIBMODULEMD
   7 therefore the declaration should also match its definition scope
   8
   9 Fixes build issues flagged by clang
  10
  11 src/createrepo_c.c:850:16: error: incompatible integer to pointer conversion initializing 'gchar *' (aka 'char *') with an
  12  expression of type 'int' [-Wint-conversion]
  13 |   850 |         gchar *compressed_path = cr_compress_groupfile(cmd_options->groupfile_fullpath, tmp_out_repo, compression);
  14 |       |                ^                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  15
  16 Upstream-Status: Submitted [https://github.com/rpm-software-management/createrepo_c/pull/387]
  17 Signed-off-by: Khem Raj <raj.khem@gmail.com>
  18 ---
  19  src/metadata_internal.h | 6 +++---
  20  1 file changed, 3 insertions(+), 3 deletions(-)
  21
  22 diff --git a/src/metadata_internal.h b/src/metadata_internal.h
  23 index 8ba0576..ecfbac2 100644
  24 --- a/src/metadata_internal.h
  25 +++ b/src/metadata_internal.h
  26 @@ -52,14 +52,14 @@ cr_metadata_load_modulemd(ModulemdModuleIndex **moduleindex,
  27   * @param dest_dir      Path to directory where the compressed groupfile should be stored.
  28   * @return              Path to the new compressed groupfile. Has to be freed by the caller.
  29   */
  30 +
  31 +#endif /* WITH_LIBMODULEMD */
  32 +
  33  gchar *
  34  cr_compress_groupfile(const char *groupfile,
  35                        const char *dest_dir,
  36                        cr_CompressionType compression);
  37
  38 -
  39 -#endif /* WITH_LIBMODULEMD */
  40 -
  41  #ifdef __cplusplus
  42  }
  43  #endif
  44 --
  45 2.42.0
  46