~ubuntu-branches/ubuntu/trusty/screen/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/16fix_gcc_warnings.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Jan Christoph Nordholz
  • Date: 2008-06-12 19:33:30 UTC
  • mfrom: (1.1.13 intrepid)
  • Revision ID: james.westby@ubuntu.com-20080612193330-1tt3qhpxonbgdmq2
Tags: 4.0.3-11
* Unbreak <End> and <^A Bksp> using a patch from Loïc Minier
  (thanks!) - introduced as new 45suppress_remap.dpatch.
  Closes: #484647.
* Bump Standards version to 3.8.0. No changes necessary.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 16fix_gcc_warnings.dpatch by  <hesso@pool.math.tu-berlin.de>
 
3
##
 
4
## DP: Get rid of several minor gcc warnings.
 
5
 
 
6
@DPATCH@
 
7
diff -Naur screen-4.0.3.orig/attacher.c screen-4.0.3/attacher.c
 
8
--- screen-4.0.3.orig/attacher.c        2008-06-01 23:40:23.000000000 +0200
 
9
+++ screen-4.0.3/attacher.c     2008-06-01 23:41:01.000000000 +0200
 
10
@@ -820,7 +820,7 @@
 
11
   pam_handle_t *pamh = 0;
 
12
   int pam_error;
 
13
 #endif
 
14
-  char *pass, mypass[16 + 1], salt[3];
 
15
+  char *pass = 0, mypass[16 + 1], salt[3];
 
16
   int using_pam = 1;
 
17
 
 
18
 #ifdef USE_PAM
 
19
diff -Naur screen-4.0.3.orig/layer.c screen-4.0.3/layer.c
 
20
--- screen-4.0.3.orig/layer.c   2008-06-01 23:39:49.000000000 +0200
 
21
+++ screen-4.0.3/layer.c        2008-06-01 23:41:01.000000000 +0200
 
22
@@ -451,7 +451,7 @@
 
23
 void
 
24
 LClearLine(l, y, xs, xe, bce, ol)
 
25
 struct layer *l;
 
26
-int xs, xe, bce;
 
27
+int y, xs, xe, bce;
 
28
 struct mline *ol;
 
29
 {
 
30
   struct canvas *cv;
 
31
diff -Naur screen-4.0.3.orig/process.c screen-4.0.3/process.c
 
32
--- screen-4.0.3.orig/process.c 2008-06-01 23:40:40.000000000 +0200
 
33
+++ screen-4.0.3/process.c      2008-06-01 23:41:01.000000000 +0200
 
34
@@ -3123,7 +3123,7 @@
 
35
           int newnr, fl = 0, kf = 0, af = 0, df = 0, mf = 0;
 
36
          struct display *odisp = display;
 
37
          int used = 0;
 
38
-          struct kmap_ext *kme;
 
39
+          struct kmap_ext *kme = 0;
 
40
 
 
41
          for (; *args && **args == '-'; args++, argl++)
 
42
            {
 
43
diff -Naur screen-4.0.3.orig/screen.c screen-4.0.3/screen.c
 
44
--- screen-4.0.3.orig/screen.c  2008-06-01 23:39:49.000000000 +0200
 
45
+++ screen-4.0.3/screen.c       2008-06-01 23:41:01.000000000 +0200
 
46
@@ -2360,7 +2360,7 @@
 
47
   int truncpos = -1;
 
48
   int truncper = 0;
 
49
   int trunclong = 0;
 
50
-  struct backtick *bt;
 
51
+  struct backtick *bt = 0;
 
52
  
 
53
   if (winmsg_numrend >= 0)
 
54
     winmsg_numrend = 0;