pkgman: fix for syntax (help)

The tool "pkgman" was not showing it's help text
and this seems to be somehow related to the
initialization of constants such as
"kCommandCategoryPackages"; these values seems to
be coming through as empty-string for some reason.
I am changing those to be "#define" of regular
C-Strings and this seems to resolve the problem.
These values only seem to be used to group the
possible commands for production of the syntax or
help text - there do not seem to be any deeper
impacts beyond that functionality.

Change-Id: If9cd61462cd7f1f1b5ab2ece521bb3f00a1ba246
Reviewed-on: https://review.haiku-os.org/c/1139
Reviewed-by: waddlesplash <[email protected]>
Reviewed-by: Adrien Destugues <[email protected]>

src/bin/pkgman/command_add_repo.cpp

@@ -40,7 +40,7 @@ static const char* const kLongUsage =
 
 
 DEFINE_COMMAND(AddRepoCommand, "add-repo", kShortUsage, kLongUsage,
-	kCommandCategoryRepositories)
+	COMMAND_CATEGORY_REPOSITORIES)
 
 
 int

src/bin/pkgman/command_drop_repo.cpp

@@ -37,7 +37,7 @@ static const char* const kLongUsage =
 
 
 DEFINE_COMMAND(DropRepoCommand, "drop-repo", kShortUsage, kLongUsage,
-	kCommandCategoryRepositories)
+	COMMAND_CATEGORY_REPOSITORIES)
 
 
 int

src/bin/pkgman/command_full_sync.cpp

@@ -47,7 +47,7 @@ static const char* const kLongUsage =
 
 
 DEFINE_COMMAND(FullSyncCommand, "full-sync", kShortUsage, kLongUsage,
-	kCommandCategoryPackages)
+	COMMAND_CATEGORY_PACKAGES)
 
 
 int

src/bin/pkgman/command_install.cpp

@@ -53,7 +53,7 @@ static const char* const kLongUsage =
 
 
 DEFINE_COMMAND(InstallCommand, "install", kShortUsage, kLongUsage,
-	kCommandCategoryPackages)
+	COMMAND_CATEGORY_PACKAGES)
 
 
 int

src/bin/pkgman/command_list_repos.cpp

@@ -43,7 +43,7 @@ static const char* const kLongUsage =
 
 
 DEFINE_COMMAND(ListReposCommand, "list-repos", kShortUsage, kLongUsage,
-	kCommandCategoryRepositories)
+	COMMAND_CATEGORY_REPOSITORIES)
 
 
 int

src/bin/pkgman/command_refresh.cpp

@@ -38,7 +38,7 @@ static const char* const kLongUsage =
 
 
 DEFINE_COMMAND(RefreshCommand, "refresh", kShortUsage, kLongUsage,
-	kCommandCategoryRepositories)
+	COMMAND_CATEGORY_REPOSITORIES)
 
 
 int

src/bin/pkgman/command_resolve_dependencies.cpp

@@ -62,7 +62,7 @@ static const char* const kLongUsage =
 
 
 DEFINE_COMMAND(ResolveDependenciesCommand, "resolve-dependencies", kShortUsage,
-	kLongUsage, kCommandCategoryOther)
+	kLongUsage, COMMAND_CATEGORY_OTHER)
 
 
 static void

src/bin/pkgman/command_search.cpp

@@ -66,7 +66,7 @@ static const char* const kLongUsage =
 
 
 DEFINE_COMMAND(SearchCommand, "search", kShortUsage, kLongUsage,
-	kCommandCategoryPackages)
+	COMMAND_CATEGORY_PACKAGES)
 
 
 static int

src/bin/pkgman/command_uninstall.cpp

@@ -45,7 +45,7 @@ static const char* const kLongUsage =
 
 
 DEFINE_COMMAND(UninstallCommand, "uninstall", kShortUsage, kLongUsage,
-	kCommandCategoryPackages)
+	COMMAND_CATEGORY_PACKAGES)
 
 
 int

src/bin/pkgman/command_update.cpp

@@ -49,7 +49,7 @@ static const char* const kLongUsage =
 
 
 DEFINE_COMMAND(UpdateCommand, "update", kShortUsage, kLongUsage,
-	kCommandCategoryPackages)
+	COMMAND_CATEGORY_PACKAGES)
 
 
 int

src/bin/pkgman/pkgman.cpp

@@ -23,11 +23,6 @@ extern const char* __progname;
 const char* kProgramName = __progname;
 
 
-const BString kCommandCategoryPackages("packages");
-const BString kCommandCategoryRepositories("repositories");
-const BString kCommandCategoryOther("other");
-
-
 static const char* const kUsage =
 	"Usage: %s <command> <command args>\n"
 	"Manages packages and package repositories.\n"
@@ -59,11 +54,11 @@ void
 print_usage_and_exit(bool error)
 {
 	BString packageCommandsUsage
-		= get_commands_usage_for_category(kCommandCategoryPackages);
+		= get_commands_usage_for_category(COMMAND_CATEGORY_PACKAGES);
 	BString repositoryCommandsUsage
-		= get_commands_usage_for_category(kCommandCategoryRepositories);
+		= get_commands_usage_for_category(COMMAND_CATEGORY_REPOSITORIES);
 	BString otherCommandsUsage
-		= get_commands_usage_for_category(kCommandCategoryOther);
+		= get_commands_usage_for_category(COMMAND_CATEGORY_OTHER);
 
     fprintf(error ? stderr : stdout, kUsage, kProgramName,
     	packageCommandsUsage.String(), repositoryCommandsUsage.String(),

src/bin/pkgman/pkgman.h

@@ -38,9 +38,9 @@ do {																\
 void	print_usage_and_exit(bool error);
 
 
-extern const BString kCommandCategoryPackages;
-extern const BString kCommandCategoryRepositories;
-extern const BString kCommandCategoryOther;
+#define COMMAND_CATEGORY_PACKAGES		"packages"
+#define COMMAND_CATEGORY_REPOSITORIES	"repositories"
+#define COMMAND_CATEGORY_OTHER			"other"
 
 
 #endif	// PKGMAN_H