~ubuntu-branches/ubuntu/trusty/altermime/trusty

#! /bin/sh /usr/share/dpatch/dpatch-run

## 10_fix_printk_warnings.dpatch by  <julien@kirya.net>

##

## All lines beginning with `## DP:' are a description of the patch.

## DP: Fix compile errors on debug statements

 

@DPATCH@

diff -urNad altermime~/qpe.c altermime/qpe.c

--- altermime~/qpe.c    2008-10-30 18:29:35.000000000 +0100

+++ altermime/qpe.c     2008-11-22 20:33:37.000000000 +0100

@@ -97,7 +97,7 @@

                                op+= strlen(paragraph);// +3; /** jump the output + =\r\n **/

                                out_remaining-= (strlen(paragraph)); // Was +3, updated to fix Outlook problems

 

-                               QPD fprintf(stdout, "Soft break (%d + %d > 76 char) for '%s'\n", current_line_length, charout_size, paragraph);

+                               QPD fprintf(stdout, "Soft break (%Zd + %d > 76 char) for '%s'\n", current_line_length, charout_size, paragraph);

                                

                                /** reinitialize the paragraph **/

                                paragraph[0] = '\0';

@@ -108,7 +108,7 @@

                        }

 

                        snprintf(pp, pp_remaining, "%s", charout);

-                       QPD fprintf(stdout,"charout='%s', size=%d, pp_remain=%d result='%s'\n", charout, charout_size, pp_remaining, paragraph);

+                       QPD fprintf(stdout,"charout='%s', size=%d, pp_remain=%Zd result='%s'\n", charout, charout_size, pp_remaining, paragraph);

                        pp += charout_size;

                        pp_remaining -= charout_size;

                        p++;

@@ -149,13 +149,13 @@

        out_size = in_size *3;

        in_buffer = malloc( sizeof(char) *in_size +1);

        if (in_buffer == NULL) {

-               QPD fprintf(stdout,"Error allocating %d bytes for input buffer\n", in_size);

+               QPD fprintf(stdout,"Error allocating %Zd bytes for input buffer\n", in_size);

                return -1;

        }

 

        out_buffer = malloc( sizeof(char) *out_size *3 +1);

        if (in_buffer == NULL) {

-               QPD fprintf(stdout,"Error allocating %d bytes for output buffer\n", out_size);

+               QPD fprintf(stdout,"Error allocating %Zd bytes for output buffer\n", out_size);

                return -1;

        }

 

@@ -169,7 +169,7 @@

          ** we segfault ;)  **/

        *(in_buffer +in_size) = '\0';

 

-       QPD fprintf(stdout,"file %s is loaded, size = %d\n", fname, in_size);

+       QPD fprintf(stdout,"file %s is loaded, size = %Zd\n", fname, in_size);

 

        qp_encode( out_buffer, out_size, in_buffer, in_size );