optimized

leleliu008 · Jul 31, 2024 · 0d4ab5d · 0d4ab5d
1 parent 5626e86
commit 0d4ab5d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/macos-brew.yml b/.github/workflows/macos-brew.yml
@@ -38,7 +38,7 @@ jobs:
             depends_on "libarchive"
 
             def install
-              system "cmake", "-S", ".", "-B", "build", "-DCMAKE_BUILD_TYPE=Debug", "-DCMAKE_VERBOSE_MAKEFILE=ON", *std_cmake_args
+              system "cmake", "-S", ".", "-B", "build", "-DCMAKE_BUILD_TYPE=Release", "-DCMAKE_VERBOSE_MAKEFILE=ON"
               system "cmake", "--build",   "build"
               system "cmake", "--install", "build"
             end
@@ -162,7 +162,7 @@ jobs:
             depends_on "libarchive"
 
             def install
-              system "cmake", "-S", ".", "-B", "build", "-DCMAKE_BUILD_TYPE=Debug", "-DCMAKE_VERBOSE_MAKEFILE=ON", "-DCMAKE_C_FLAGS='-fsanitize=undefined -fsanitize=address -fsanitize=leak'", "-DCMAKE_C_COMPILER=#{Formula["llvm"].opt_prefix}/bin/clang", *std_cmake_args
+              system "cmake", "-S", ".", "-B", "build", "-DCMAKE_BUILD_TYPE=Debug", "-DCMAKE_VERBOSE_MAKEFILE=ON", "-DCMAKE_C_FLAGS='-fsanitize=undefined -fsanitize=address -fsanitize=leak'", "-DCMAKE_C_COMPILER=#{Formula["llvm"].opt_prefix}/bin/clang"
               system "cmake", "--build",   "build"
               system "cmake", "--install", "build"
             end

diff --git a/src/cleanup.c b/src/cleanup.c
@@ -53,7 +53,7 @@ static int uppm_cleanup_downloads(const bool verbose) {
         if (dir_entry == NULL) {
             if (errno == 0) {
                 closedir(dir);
-                break;
+                return UPPM_OK;
             } else {
                 perror(downloadDIR);
                 closedir(dir);

diff --git a/src/formula-path.c b/src/formula-path.c
@@ -38,9 +38,9 @@ static int uppm_formula_repo_scan_callback(UPPMFormulaRepo * formulaRepo, const
         if (args->len != NULL) {
             (*(args->len)) = ret;
         }
-
-        return UPPM_OK;
     }
+
+    return UPPM_OK;
 }
 
 int uppm_formula_path(const char * packageName, char buf[], size_t * len) {

diff --git a/src/uninstall.c b/src/uninstall.c
@@ -104,6 +104,8 @@ int uppm_uninstall(const char * packageName, const bool verbose) {
                 // package is broken. is not installed completely?
                 return UPPM_ERROR_PACKAGE_NOT_INSTALLED;
             }
+        } else {
+            return UPPM_ERROR_PACKAGE_NOT_INSTALLED;
         }
     } else {
         return UPPM_ERROR_PACKAGE_NOT_INSTALLED;

diff --git a/src/upgrade-self.c b/src/upgrade-self.c
@@ -57,7 +57,7 @@ static int uppm_upgrade_tar_filename(char buf[], const size_t bufSize, const cha
         osVersMajor = 14;
     }
 
-    ret = snprintf(buf, bufSize, "uppm-%s-%s-%s.0-%s.tar.xz", latestVersion, osType, osVersMajor, osArch);
+    ret = snprintf(buf, bufSize, "uppm-%s-%s-%d.0-%s.tar.xz", latestVersion, osType, osVersMajor, osArch);
 #elif defined (__DragonFly__)
     ret = snprintf(buf, bufSize, "uppm-%s-%s-%s-%s.tar.xz", latestVersion, osType, osVers, osArch);
 #elif defined (__FreeBSD__)