Control: tags -1 + patch

This popped up on BOTD today, you'll find patches below.
I've uploaded an NMU with this to mentors.d.n for your convenience
and so the package can re-enter trixie soon.

Best,
From: =?utf-8?b?0L3QsNCx?= <nabijaczlew...@nabijaczleweli.xyz>
Date: Fri, 17 Jan 2025 17:49:03 +0100
Subject: -Wformat

---
 postmark-1.53.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/postmark-1.53.c b/postmark-1.53.c
index 3fbbddc..d11394d 100644
--- a/postmark-1.53.c
+++ b/postmark-1.53.c
@@ -525,36 +525,36 @@
 time_t end_time,start_time,t_end_time,t_start_time; /* timers from run */
 int deleted; /* files deleted back-to-back */
 {
-   time_t elapsed,t_elapsed;
+   long long elapsed,t_elapsed;
    int interval;
 
    elapsed=diff_time(end_time,start_time);
    t_elapsed=diff_time(t_end_time,t_start_time);
 
    fprintf(fp,"Time:\n");
-   fprintf(fp,"\t%d seconds total\n",elapsed);
-   fprintf(fp,"\t%d seconds of transactions (%d per second)\n",t_elapsed,
+   fprintf(fp,"\t%lld seconds total\n",elapsed);
+   fprintf(fp,"\t%lld seconds of transactions (%lld per second)\n",t_elapsed,
       transactions/t_elapsed);
 
    fprintf(fp,"\nFiles:\n");
-   fprintf(fp,"\t%d created (%d per second)\n",files_created,
+   fprintf(fp,"\t%d created (%lld per second)\n",files_created,
       files_created/elapsed);
 
    interval=diff_time(t_start_time,start_time);
    fprintf(fp,"\t\tCreation alone: %d files (%d per second)\n",simultaneous,
       simultaneous/interval);
-   fprintf(fp,"\t\tMixed with transactions: %d files (%d per second)\n",
+   fprintf(fp,"\t\tMixed with transactions: %d files (%lld per second)\n",
       files_created-simultaneous,(files_created-simultaneous)/t_elapsed);
-   fprintf(fp,"\t%d read (%d per second)\n",files_read,files_read/t_elapsed);
-   fprintf(fp,"\t%d appended (%d per second)\n",files_appended,
+   fprintf(fp,"\t%d read (%lld per second)\n",files_read,files_read/t_elapsed);
+   fprintf(fp,"\t%d appended (%lld per second)\n",files_appended,
       files_appended/t_elapsed);
-   fprintf(fp,"\t%d deleted (%d per second)\n",files_deleted,
+   fprintf(fp,"\t%d deleted (%lld per second)\n",files_deleted,
       files_deleted/elapsed);
-   
+
    interval=diff_time(end_time,t_end_time);
    fprintf(fp,"\t\tDeletion alone: %d files (%d per second)\n",deleted,
       deleted/interval);
-   fprintf(fp,"\t\tMixed with transactions: %d files (%d per second)\n",
+   fprintf(fp,"\t\tMixed with transactions: %d files (%lld per second)\n",
       files_deleted-deleted,(files_deleted-deleted)/t_elapsed);
 
    fprintf(fp,"\nData:\n");
@@ -569,14 +569,14 @@
 time_t end_time,start_time,t_end_time,t_start_time; /* timers from run */
 int deleted; /* files deleted back-to-back */
 {
-   time_t elapsed,t_elapsed;
+   long long elapsed,t_elapsed;
 
    elapsed=diff_time(end_time,start_time);
    t_elapsed=diff_time(t_end_time,t_start_time);
 
-   fprintf(fp,"%d %d %.2f ", elapsed, t_elapsed, 
+   fprintf(fp,"%lld %lld %.2f ", elapsed, t_elapsed,
       (float)transactions/t_elapsed);
-   fprintf(fp, "%.2f %.2f %.2f ", (float)files_created/elapsed, 
+   fprintf(fp, "%.2f %.2f %.2f ", (float)files_created/elapsed,
       (float)simultaneous/diff_time(t_start_time,start_time),
       (float)(files_created-simultaneous)/t_elapsed);
    fprintf(fp, "%.2f %.2f ", (float)files_read/t_elapsed,
@@ -663,7 +663,7 @@
 
    if (subdirectories>1)
       {
-      sprintf(conversion,"s%d%s",RND(subdirectories),SEPARATOR);
+      sprintf(conversion,"s%lu%s",RND(subdirectories),SEPARATOR);
       strcat(dest,conversion);
       }
 
From: =?utf-8?b?0L3QsNCx?= <nabijaczlew...@nabijaczleweli.xyz>
Date: Fri, 17 Jan 2025 17:50:12 +0100
Subject: GCC 14

---
 postmark-1.53.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/postmark-1.53.c b/postmark-1.53.c
index d11394d..ecb763d 100644
--- a/postmark-1.53.c
+++ b/postmark-1.53.c
@@ -59,6 +59,10 @@
 #include <stdlib.h>
 #include <time.h>
 #include <fcntl.h>
+#include <unistd.h>
+#include <sys/stat.h>
+
+int read_config_file(char *filename, char *buffer, int ignore);
 
 #define PM_VERSION "v1.51 : 8/14/01"
 
@@ -1215,13 +1219,13 @@
    else
       if (!ignore)
          fprintf(stderr,"Error: cannot read configuration file '%s'\n",
-            filename); 
+            filename);
 
    return(result);
 }
 
 /* main function - reads config files then enters get line/parse line loop */
-main(argc,argv)
+int main(argc,argv)
 int argc;
 char *argv[];
 {

Attachment: signature.asc
Description: PGP signature

Reply via email to