r17011 - /trunk/libauthen-krb5-perl/debian/patches/warning-cleanup

[rra at users.alioth.debian.org]

Author: rra
Date: Sat Mar  8 23:46:18 2008
New Revision: 17011

URL: http://svn.debian.org/wsvn/?sc=1&rev=17011
Log:
Further warning cleanup.

Modified:
    trunk/libauthen-krb5-perl/debian/patches/warning-cleanup

Modified: trunk/libauthen-krb5-perl/debian/patches/warning-cleanup
URL: http://svn.debian.org/wsvn/trunk/libauthen-krb5-perl/debian/patches/warning-cleanup?rev=17011&op=diff
==============================================================================
--- trunk/libauthen-krb5-perl/debian/patches/warning-cleanup (original)
+++ trunk/libauthen-krb5-perl/debian/patches/warning-cleanup Sat Mar  8 23:46:18 2008
@@ -38,7 +38,39 @@
  		SvIVX(ST(0)) = err;
  		SvIOK_on(ST(0));
  	}
-@@ -480,7 +491,6 @@
+@@ -275,7 +286,7 @@
+ 	OUTPUT:
+ 	RETVAL
+ 
+-char *
++SV *
+ krb5_kt_default_name()
+         CODE:
+         char name[BUFSIZ];
+@@ -283,7 +294,10 @@
+ 	if (err)
+                 XSRETURN_UNDEF;
+         name[sizeof name - 1] = '\0';
+-	ST(0) = sv_2mortal(newSVpv(name, 0));
++	RETVAL = newSVpv(name, 0);
++
++	OUTPUT:
++        RETVAL
+ 
+ Authen::Krb5::Keytab
+ krb5_kt_default()
+@@ -292,8 +306,8 @@
+ 	if (err)
+                 XSRETURN_UNDEF;
+ 
+-        OUTPUT:
+-        RETVAL
++	OUTPUT:
++	RETVAL
+ 
+ Authen::Krb5::Keyblock
+ krb5_kt_read_service_key(name, principal, kvno = 0, enctype = 0)
+@@ -480,7 +494,6 @@
  	PREINIT:
  	krb5_data in_data;
  	krb5_ticket *t;
@@ -46,9 +78,54 @@
  
  	CODE:
  	if (!New(0,t,1,krb5_ticket)) XSRETURN_UNDEF;
+@@ -948,9 +961,6 @@
+ getkey(auth_context)
+ 	Authen::Krb5::AuthContext auth_context;
+ 
+-	PREINIT:
+-	SV *sv;
+-
+ 	CODE:
+ 	err = krb5_auth_con_getkey(context, auth_context, &RETVAL);
+ 	if (err) XSRETURN_UNDEF;
+@@ -1072,15 +1082,17 @@
+         OUTPUT:
+         RETVAL
+ 
+-krb5_octet *
++SV *
+ contents(keyblock)
+         Authen::Krb5::Keyblock keyblock
+ 
+-        CODE:
+-        ST(0) = keyblock->contents
+-	    ? sv_2mortal(newSVpv(keyblock->contents, keyblock->length))
+-            : &PL_sv_undef;
++	CODE:
++	if (keyblock->contents == NULL)
++		XSRETURN_UNDEF;
++	RETVAL = newSVpv((char *) keyblock->contents, keyblock->length);
+ 
++	OUTPUT:
++	RETVAL
+ 
+ void
+ DESTROY(keyblock)
 --- libauthen-krb5-perl.orig/krb5_constants.c
 +++ libauthen-krb5-perl/krb5_constants.c
-@@ -1366,18 +1366,6 @@
+@@ -1,11 +1,3 @@
+-static int
+-not_here(s)
+-char *s;
+-{
+-    croak("%s not implemented on this architecture", s);
+-    return -1;
+-}
+-
+ static double
+ constant(name, arg)
+ char *name;
+@@ -1366,18 +1358,6 @@
  #else
  	    goto not_there;
  #endif
@@ -67,7 +144,7 @@
  	if (strEQ(name, "KRB5_CCACHE_BADVNO"))
  #ifdef KRB5_CCACHE_BADVNO
  	    return KRB5_CCACHE_BADVNO;
-@@ -1558,12 +1546,6 @@
+@@ -1558,12 +1538,6 @@
  #else
  	    goto not_there;
  #endif
@@ -80,7 +157,7 @@
  	if (strEQ(name, "KRB5_GET_IN_TKT_LOOP"))
  #ifdef KRB5_GET_IN_TKT_LOOP
  	    return KRB5_GET_IN_TKT_LOOP;
-@@ -3040,12 +3022,6 @@
+@@ -3040,24 +3014,6 @@
      case 'z':
  	break;
      case '_':
@@ -90,6 +167,18 @@
 -#else
 -	    goto not_there;
 -#endif
- 	if (strEQ(name, "_SIZET"))
- #ifdef _SIZET
- 	    return _SIZET;
+-	if (strEQ(name, "_SIZET"))
+-#ifdef _SIZET
+-	    return _SIZET;
+-#else
+-	    goto not_there;
+-#endif
+-	if (strEQ(name, "_SIZE_T_DEFINED"))
+-#ifdef _SIZE_T_DEFINED
+-	    return _SIZE_T_DEFINED;
+-#else
+-	    goto not_there;
+-#endif
+ 	break;
+     }
+     errno = EINVAL;