poe

чување 0f53164e4d50919afce348984e1101000a6534d1
родитељ 35daf184acf082a0fabd1db8d71c9ad809acca16
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Tue, 12 Mar 2024 12:34:50 +0100

program_name -> PROGRAMNAME (macro); poe.c: sled -> PROGRAMNAME

Signed-off-by: Страхиња Радић <contact@strahinja.org>

Diffstat:
M
draw.c
 | 
1
-
M
poe.c
 | 
15
+++++++--------
M
util.h
 | 
9
+++++----

измењених датотека: 3, додавања: 12(+), брисања: 13(-)
diff --git a/draw.c b/draw.c
@@ -54,7 +54,6 @@ const char* flag_strings[]	= {
 	[FL_NO_C_FORMAT]	= "no-c-format",
 	[FL_FUZZY]		= "fuzzy"};
 const char* first_entry_msgid	= "*** SPECIAL: file info ***";
-const char* program_name	= "poe";
 const char* prompt_dirty	= "File changed, save [y/n/ESC]?";
 const char* prompt_cancel_dirty = "Entry changed, save [y/n/ESC]?";
 const char* prompt_overwrite	= "Not empty, overwrite? [y/n/ESC]?";
diff --git a/poe.c b/poe.c
@@ -28,7 +28,6 @@ extern const char* errors[];
 extern const char* prompt_dirty;
 extern const char* prompt_cancel_dirty;
 extern const char* prompt_overwrite;
-extern const char* program_name;
 
 void cancel_callback(struct DrawState* state, struct tb_event* ev);
 char* dirname(char* path);
@@ -643,7 +642,7 @@ print_error(const int code, const char* msg, ...)
 	va_start(args, msg);
 	vsnprintf(buf, sizeof(buf), msg, args);
 	va_end(args);
-	fprintf(stderr, "%s: %s\n", program_name, buf);
+	fprintf(stderr, "%s: %s\n", PROGRAMNAME, buf);
 	return code;
 }
 
@@ -2142,7 +2141,7 @@ main(int argc, char** argv)
 #ifdef __OpenBSD__
 	if (pledge("stdio tty unveil rpath wpath cpath fattr", NULL) < 0)
 	{
-		perror("sled: pledge");
+		perror(PROGRAMNAME ": pledge");
 		exit(1);
 	}
 #endif
@@ -2153,17 +2152,17 @@ main(int argc, char** argv)
 	{
 		printf("Usage: %s [-h|--help] [-v|--version] "
 		       "[-V|--full-version] [filename.po]\n",
-			program_name);
+			PROGRAMNAME);
 		return 0;
 	}
 	else if (!strcmp(argv[1], "-v") || !strcmp(argv[1], "--version"))
 	{
-		printf("%s %s, committed on %s\n", program_name, VERSION, DATE);
+		printf("%s %s, committed on %s\n", PROGRAMNAME, VERSION, DATE);
 		return 0;
 	}
 	else if (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--full-version"))
 	{
-		printf("%s %s, committed on %s\n", program_name, VERSION, DATE);
+		printf("%s %s, committed on %s\n", PROGRAMNAME, VERSION, DATE);
 		printf("Features set in config.h:\n");
 #ifdef CREATE_BACKUPS
 		printf("  CREATE_BACKUPS:\tset\n");
@@ -2195,7 +2194,7 @@ main(int argc, char** argv)
 
 	if (stat(filename, &st) == -1 || access(filename, R_OK | W_OK) == -1)
 	{
-		perror(program_name);
+		perror(PROGRAMNAME);
 		return errno;
 	}
 
@@ -2341,7 +2340,7 @@ main(int argc, char** argv)
 	goto init_termbox;
 
 file_error:
-	perror(program_name);
+	perror(PROGRAMNAME);
 	return errno;
 
 init_termbox:
diff --git a/util.h b/util.h
@@ -4,10 +4,11 @@
 
 #include <stdint.h>
 #include <sys/types.h>
-#define ABS(a)	  ((a < 0) ? (-a) : (a))
-#define LEN(x)	  (sizeof(x) / sizeof(x[0]))
-#define MAX(a, b) ((a > b) ? a : b)
-#define MIN(a, b) ((a < b) ? a : b)
+#define ABS(a)	    ((a < 0) ? (-a) : (a))
+#define LEN(x)	    (sizeof(x) / sizeof(x[0]))
+#define MAX(a, b)   ((a > b) ? a : b)
+#define MIN(a, b)   ((a < b) ? a : b)
+#define PROGRAMNAME "poe"
 #define STRLCAT(tail, head, totallen)                                     \
 	do                                                                \
 	{                                                                 \