From a01c29ba37d48ce673511f55d7a72fefd8ff19f2 Mon Sep 17 00:00:00 2001
From: Vector Li <huanli@redhat.com>
Date: Wed, 11 Jan 2023 17:18:54 +0800
Subject: [PATCH] Use global variable instead of macros

Note that a global variable is used as it can be initialized as:
    static const gchar *g_git_branches[] = {"main", "master"};
which is much simpler than using macros.

Signed-off-by: Vector Li <huanli@redhat.com>
---
 src/fetch_git.c | 21 ++++++++++-----------
 src/fetch_git.h |  3 ---
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/fetch_git.c b/src/fetch_git.c
index 0e26e241..296a8874 100644
--- a/src/fetch_git.c
+++ b/src/fetch_git.c
@@ -1,4 +1,4 @@
-/*  
+/*
     This file is part of Restraint.
 
     Restraint is free software: you can redistribute it and/or modify
@@ -30,6 +30,11 @@
 #include "fetch.h"
 #include "fetch_git.h"
 
+// The main branch ("main") is fetched by default, but we also support to
+// fetch the legacy one (i.e. "master") because it is required by some old
+// repositories.
+static const gchar *g_git_branches[] = {"main", "master"};
+
 static gint
 packet_length(const gchar *linelen)
 {
@@ -231,17 +236,11 @@ myopen(FetchData *fetch_data, GError **error)
         goto error;
     }
 
-    // get all branches and have a try one by one
-    char *branches[GIT_BRANCHES_SIZE + 1] = {};
-    char *branch = strtok(GIT_BRANCHES, GIT_BRANCHES_DELIMITER);
-    int i = 0;
-    while (branch != NULL && i < GIT_BRANCHES_SIZE) {
-        branches[i++] = branch;
-        branch = strtok(NULL, GIT_BRANCHES_DELIMITER);
-    }
-    for (i = 0; i < GIT_BRANCHES_SIZE; i++) {
+    // traverse git branches one by one
+    for (gint i = 0; i < sizeof (g_git_branches) / sizeof (const gchar *); i++) {
+        gchar *branch = (gchar *)(g_git_branches[i]);
         write_succeeded = packet_write(fetch_data->ostream, &tmp_error, "argument %s:%s\0",
-                               fetch_data->url->query == NULL ? branches[i]: fetch_data->url->query,
+                               fetch_data->url->query == NULL ? branch: fetch_data->url->query,
                                fetch_data->url->fragment == NULL ? "" : fetch_data->url->fragment + fragment_offset);
         if (write_succeeded)
             break;
diff --git a/src/fetch_git.h b/src/fetch_git.h
index 4b033873..83a73fb6 100644
--- a/src/fetch_git.h
+++ b/src/fetch_git.h
@@ -19,9 +19,6 @@
 #define _RESTRAINT_FETCH_GIT_H
 
 #define GIT_PORT 9418
-#define GIT_BRANCHES_DELIMITER ","
-#define GIT_BRANCHES "main,master"
-#define GIT_BRANCHES_SIZE 2
 #define HDR_LEN_SIZE 4
 
 #include <libsoup/soup.h>