From 2eb4819240761b80a3cc1bec1e8ea69b613aa333 Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Wed, 8 Jan 2025 21:04:58 +0000 Subject: [PATCH] Fix "end of line" typo in internal #defines The ostree and Flatpak APIs both refer to "end of life", but this internal #define (though not the data stored in the cache) refer to "end of line". Fix this. --- app/flatpak-builtins-remote-info.c | 4 ++-- app/flatpak-builtins-remote-ls.c | 8 ++++---- app/flatpak-builtins-repo.c | 8 ++++---- common/flatpak-oci-registry.c | 4 ++-- common/flatpak-remote-ref.c | 4 ++-- common/flatpak-repo-utils-private.h | 4 ++-- common/flatpak-repo-utils.c | 4 ++-- common/flatpak-transaction.c | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/flatpak-builtins-remote-info.c b/app/flatpak-builtins-remote-info.c index 03f70c48..8dee2af7 100644 --- a/app/flatpak-builtins-remote-info.c +++ b/app/flatpak-builtins-remote-info.c @@ -168,8 +168,8 @@ flatpak_builtin_remote_info (int argc, char **argv, GCancellable *cancellable, G if (flatpak_remote_state_lookup_sparse_cache (state, flatpak_decomposed_get_ref (ref), &sparse_cache, NULL)) { - eol = var_metadata_lookup_string (sparse_cache, FLATPAK_SPARSE_CACHE_KEY_ENDOFLINE, NULL); - eol_rebase = var_metadata_lookup_string (sparse_cache, FLATPAK_SPARSE_CACHE_KEY_ENDOFLINE_REBASE, NULL); + eol = var_metadata_lookup_string (sparse_cache, FLATPAK_SPARSE_CACHE_KEY_ENDOFLIFE, NULL); + eol_rebase = var_metadata_lookup_string (sparse_cache, FLATPAK_SPARSE_CACHE_KEY_ENDOFLIFE_REBASE, NULL); } if (opt_show_ref || opt_show_commit || opt_show_parent || opt_show_metadata || opt_show_runtime || opt_show_sdk) diff --git a/app/flatpak-builtins-remote-ls.c b/app/flatpak-builtins-remote-ls.c index a368ccff..c56e08f5 100644 --- a/app/flatpak-builtins-remote-ls.c +++ b/app/flatpak-builtins-remote-ls.c @@ -255,8 +255,8 @@ ls_remote (GHashTable *refs_hash, const char **arches, const char *app_runtime, has_sparse_cache = flatpak_remote_state_lookup_sparse_cache (state, ref_str, &sparse_cache, NULL); if (!opt_all && has_sparse_cache) { - const char *eol = var_metadata_lookup_string (sparse_cache, FLATPAK_SPARSE_CACHE_KEY_ENDOFLINE, NULL); - const char *eol_rebase = var_metadata_lookup_string (sparse_cache, FLATPAK_SPARSE_CACHE_KEY_ENDOFLINE_REBASE, NULL); + const char *eol = var_metadata_lookup_string (sparse_cache, FLATPAK_SPARSE_CACHE_KEY_ENDOFLIFE, NULL); + const char *eol_rebase = var_metadata_lookup_string (sparse_cache, FLATPAK_SPARSE_CACHE_KEY_ENDOFLIFE_REBASE, NULL); if (eol != NULL || eol_rebase != NULL) continue; @@ -351,8 +351,8 @@ ls_remote (GHashTable *refs_hash, const char **arches, const char *app_runtime, flatpak_table_printer_add_column (printer, ""); /* Extra */ if (has_sparse_cache) { - const char *eol = var_metadata_lookup_string (sparse_cache, FLATPAK_SPARSE_CACHE_KEY_ENDOFLINE, NULL); - const char *eol_rebase = var_metadata_lookup_string (sparse_cache, FLATPAK_SPARSE_CACHE_KEY_ENDOFLINE_REBASE, NULL); + const char *eol = var_metadata_lookup_string (sparse_cache, FLATPAK_SPARSE_CACHE_KEY_ENDOFLIFE, NULL); + const char *eol_rebase = var_metadata_lookup_string (sparse_cache, FLATPAK_SPARSE_CACHE_KEY_ENDOFLIFE_REBASE, NULL); if (eol) flatpak_table_printer_append_with_comma_printf (printer, "eol=%s", eol); diff --git a/app/flatpak-builtins-repo.c b/app/flatpak-builtins-repo.c index 133af276..274198ec 100644 --- a/app/flatpak-builtins-repo.c +++ b/app/flatpak-builtins-repo.c @@ -254,9 +254,9 @@ print_branches_for_subsummary (FlatpakTablePrinter *printer, flatpak_table_printer_add_column (printer, ""); /* Options */ - if (g_variant_lookup (ref_meta, FLATPAK_SPARSE_CACHE_KEY_ENDOFLINE, "&s", &eol)) + if (g_variant_lookup (ref_meta, FLATPAK_SPARSE_CACHE_KEY_ENDOFLIFE, "&s", &eol)) flatpak_table_printer_append_with_comma_printf (printer, "eol=%s", eol); - if (g_variant_lookup (ref_meta, FLATPAK_SPARSE_CACHE_KEY_ENDOFLINE_REBASE, "&s", &eol)) + if (g_variant_lookup (ref_meta, FLATPAK_SPARSE_CACHE_KEY_ENDOFLIFE_REBASE, "&s", &eol)) flatpak_table_printer_append_with_comma_printf (printer, "eol-rebase=%s", eol); @@ -309,9 +309,9 @@ print_branches_for_subsummary (FlatpakTablePrinter *printer, if (g_variant_lookup (sparse_cache, ref, "@a{sv}", &sparse)) { const char *eol; - if (g_variant_lookup (sparse, FLATPAK_SPARSE_CACHE_KEY_ENDOFLINE, "&s", &eol)) + if (g_variant_lookup (sparse, FLATPAK_SPARSE_CACHE_KEY_ENDOFLIFE, "&s", &eol)) flatpak_table_printer_append_with_comma_printf (printer, "eol=%s", eol); - if (g_variant_lookup (sparse, FLATPAK_SPARSE_CACHE_KEY_ENDOFLINE_REBASE, "&s", &eol)) + if (g_variant_lookup (sparse, FLATPAK_SPARSE_CACHE_KEY_ENDOFLIFE_REBASE, "&s", &eol)) flatpak_table_printer_append_with_comma_printf (printer, "eol-rebase=%s", eol); } } diff --git a/common/flatpak-oci-registry.c b/common/flatpak-oci-registry.c index 7badf2ab..ad595e53 100644 --- a/common/flatpak-oci-registry.c +++ b/common/flatpak-oci-registry.c @@ -3053,9 +3053,9 @@ flatpak_oci_index_make_summary (GFile *index, if (token_type_v != NULL) g_variant_builder_add (sparse_builder, "{s@v}", FLATPAK_SPARSE_CACHE_KEY_TOKEN_TYPE, token_type_v); if (endoflife_v != NULL) - g_variant_builder_add (sparse_builder, "{s@v}", FLATPAK_SPARSE_CACHE_KEY_ENDOFLINE, endoflife_v); + g_variant_builder_add (sparse_builder, "{s@v}", FLATPAK_SPARSE_CACHE_KEY_ENDOFLIFE, endoflife_v); if (endoflife_rebase_v != NULL) - g_variant_builder_add (sparse_builder, "{s@v}", FLATPAK_SPARSE_CACHE_KEY_ENDOFLINE_REBASE, endoflife_rebase_v); + g_variant_builder_add (sparse_builder, "{s@v}", FLATPAK_SPARSE_CACHE_KEY_ENDOFLIFE_REBASE, endoflife_rebase_v); g_variant_builder_add (ref_sparse_data_builder, "{s@a{sv}}", ref, g_variant_builder_end (sparse_builder)); diff --git a/common/flatpak-remote-ref.c b/common/flatpak-remote-ref.c index 5a9a9631..ba3b7901 100644 --- a/common/flatpak-remote-ref.c +++ b/common/flatpak-remote-ref.c @@ -354,8 +354,8 @@ flatpak_remote_ref_new (FlatpakDecomposed *decomposed, if (state && flatpak_remote_state_lookup_sparse_cache (state, flatpak_decomposed_get_ref (decomposed), &sparse_cache, NULL)) { - eol = var_metadata_lookup_string (sparse_cache, FLATPAK_SPARSE_CACHE_KEY_ENDOFLINE, NULL); - eol_rebase = var_metadata_lookup_string (sparse_cache, FLATPAK_SPARSE_CACHE_KEY_ENDOFLINE_REBASE, NULL); + eol = var_metadata_lookup_string (sparse_cache, FLATPAK_SPARSE_CACHE_KEY_ENDOFLIFE, NULL); + eol_rebase = var_metadata_lookup_string (sparse_cache, FLATPAK_SPARSE_CACHE_KEY_ENDOFLIFE_REBASE, NULL); } ref = g_object_new (FLATPAK_TYPE_REMOTE_REF, diff --git a/common/flatpak-repo-utils-private.h b/common/flatpak-repo-utils-private.h index fafa16c9..fecf425e 100644 --- a/common/flatpak-repo-utils-private.h +++ b/common/flatpak-repo-utils-private.h @@ -76,8 +76,8 @@ #define FLATPAK_REPO_DEPLOY_COLLECTION_ID_KEY "DeployCollectionID" #define FLATPAK_REPO_DEPLOY_SIDELOAD_COLLECTION_ID_KEY "DeploySideloadCollectionID" -#define FLATPAK_SPARSE_CACHE_KEY_ENDOFLINE "eol" -#define FLATPAK_SPARSE_CACHE_KEY_ENDOFLINE_REBASE "eolr" +#define FLATPAK_SPARSE_CACHE_KEY_ENDOFLIFE "eol" +#define FLATPAK_SPARSE_CACHE_KEY_ENDOFLIFE_REBASE "eolr" #define FLATPAK_SPARSE_CACHE_KEY_TOKEN_TYPE "tokt" #define FLATPAK_SPARSE_CACHE_KEY_EXTRA_DATA_SIZE "eds" diff --git a/common/flatpak-repo-utils.c b/common/flatpak-repo-utils.c index d745ecff..63dc9981 100644 --- a/common/flatpak-repo-utils.c +++ b/common/flatpak-repo-utils.c @@ -1100,9 +1100,9 @@ read_commit_data (OstreeRepo *repo, g_auto(GVariantBuilder) sparse_builder = FLATPAK_VARIANT_BUILDER_INITIALIZER; g_variant_builder_init (&sparse_builder, G_VARIANT_TYPE_VARDICT); if (eol) - g_variant_builder_add (&sparse_builder, "{sv}", FLATPAK_SPARSE_CACHE_KEY_ENDOFLINE, g_variant_new_string (eol)); + g_variant_builder_add (&sparse_builder, "{sv}", FLATPAK_SPARSE_CACHE_KEY_ENDOFLIFE, g_variant_new_string (eol)); if (eol_rebase) - g_variant_builder_add (&sparse_builder, "{sv}", FLATPAK_SPARSE_CACHE_KEY_ENDOFLINE_REBASE, g_variant_new_string (eol_rebase)); + g_variant_builder_add (&sparse_builder, "{sv}", FLATPAK_SPARSE_CACHE_KEY_ENDOFLIFE_REBASE, g_variant_new_string (eol_rebase)); if (token_type >= 0) g_variant_builder_add (&sparse_builder, "{sv}", FLATPAK_SPARSE_CACHE_KEY_TOKEN_TYPE, g_variant_new_int32 (GINT32_TO_LE(token_type))); if (n_extra_data > 0) diff --git a/common/flatpak-transaction.c b/common/flatpak-transaction.c index ff9cf94d..7339acab 100644 --- a/common/flatpak-transaction.c +++ b/common/flatpak-transaction.c @@ -3454,8 +3454,8 @@ try_resolve_op_from_metadata (FlatpakTransaction *self, if (flatpak_remote_state_lookup_sparse_cache (state, flatpak_decomposed_get_ref (op->ref), &sparse_cache, NULL)) { - op->eol = g_strdup (var_metadata_lookup_string (sparse_cache, FLATPAK_SPARSE_CACHE_KEY_ENDOFLINE, NULL)); - op->eol_rebase = g_strdup (var_metadata_lookup_string (sparse_cache, FLATPAK_SPARSE_CACHE_KEY_ENDOFLINE_REBASE, NULL)); + op->eol = g_strdup (var_metadata_lookup_string (sparse_cache, FLATPAK_SPARSE_CACHE_KEY_ENDOFLIFE, NULL)); + op->eol_rebase = g_strdup (var_metadata_lookup_string (sparse_cache, FLATPAK_SPARSE_CACHE_KEY_ENDOFLIFE_REBASE, NULL)); op->token_type = GINT32_FROM_LE (var_metadata_lookup_int32 (sparse_cache, FLATPAK_SPARSE_CACHE_KEY_TOKEN_TYPE, op->token_type)); if (op->eol_rebase)