Bug#379125: Fix jabber-jit build with GCC 4.2

[Mark Brown]

tag 379125 + patch
thanks

Please find enclosed a patch fixing compilation of jabber-jit with GCC
4.2.  If desired I can prepare a NMU with this fix in it.

There are also a large number of warnings in the form:

./libicq2000/userinfoconstants.h:433: warning: deprecated conversion
from string constant to ‘char*’

All those that I looked at can be fixed by changing function arguments
to use const char * rather than plain char *.

-- 
"You grabbed my hand and we fell into it, like a daydream - or a fever."

#! /bin/sh -e
## 03-gcc-4.2.dpatch by Mark Brown <[EMAIL PROTECTED]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix build with GCC 4.2

[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"

if [ $# -ne 1 ]; then
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
    exit 1
fi
case "$1" in
   -patch) patch $patch_opts -p1 < $0;;
   -unpatch) patch $patch_opts -p1 -R < $0;;
   *)
      echo >&2 "`basename $0`: script expects -patch|-unpatch as
argument"      exit 1;;esac

exit 0
@DPATCH@
--- jabber-jit-1.1.6.orig/jit/jit/wp_client.cpp 2003-06-30 21:29:32.000000000 
+0100
+++ jabber-jit-1.1.6/jit/jit/wp_client.cpp      2007-07-01 12:56:44.000000000 
+0100
@@ -149,21 +149,25 @@
   terror e = (terror){0,""};
   
   switch(ev->getReason()){
-  case DisconnectedEvent::FAILED_BADUSERNAME:
+  case DisconnectedEvent::FAILED_BADUSERNAME: {
     e = (terror){400,"Bad username"};
     break;
+  }
 
-  case DisconnectedEvent::FAILED_TURBOING:
+  case DisconnectedEvent::FAILED_TURBOING: {
     e = (terror){503,"Turboing, connect later"};
     break;
+  }
 
-  case DisconnectedEvent::FAILED_BADPASSWORD:
+  case DisconnectedEvent::FAILED_BADPASSWORD: {
     e = (terror){400,"Bad (non mismatched) registration password"};
     break;
+  }
 
-  case DisconnectedEvent::FAILED_MISMATCH_PASSWD:
+  case DisconnectedEvent::FAILED_MISMATCH_PASSWD: {
     e = (terror){401,"Password does not match"};
     break;
+  }
 
   case DisconnectedEvent::FAILED_DUALLOGIN: {
     /* maybe we should explicitly notify due importance */
@@ -181,18 +185,21 @@
     break;
   }
 
-  case DisconnectedEvent::FAILED_LOWLEVEL:
+  case DisconnectedEvent::FAILED_LOWLEVEL: {
     e = (terror){502,"Low level network error"};
     break;
+  }
 
-  case DisconnectedEvent::FAILED_UNKNOWN:
+  case DisconnectedEvent::FAILED_UNKNOWN: {
     e = (terror){502,"Disconnected by unknown reason"};
     break;
+  }
 
-  case DisconnectedEvent::REQUESTED:
+  case DisconnectedEvent::REQUESTED: {
     log_debug(ZONE,"Disconnected on request");
     break;    
   }
+  }
   
   if (e.code != 0)
     it_session_error(sesja,e);

signature.asc
Description: Digital signature