X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=perl%2FAmanda%2FDevice.swg;fp=perl%2FAmanda%2FDevice.swg;h=6feadf35f56797556779ccaa0bd00cae2a877bca;hb=691567b16c13087b31ee4c2b6d038e57872fae82;hp=ea46300c9e3bc310df71bb46e402bcbe873c81bf;hpb=cc7d7b45afc706099acf7ff2490ec5667d370651;p=debian%2Famanda

diff --git a/perl/Amanda/Device.swg b/perl/Amanda/Device.swg
index ea46300..6feadf3 100644
--- a/perl/Amanda/Device.swg
+++ b/perl/Amanda/Device.swg
@@ -1,9 +1,10 @@
 /*
  * Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -346,92 +347,11 @@ typedef struct Device {
 		*addrs = NULL;
 	}
 
-	%newobject accept; /* connection is already ref'd, so we own it */
-	DirectTCPConnection *
-	accept() {
-	    DirectTCPConnection *conn = NULL;
-	    gboolean rv;
-
-	    rv = device_accept(self, &conn, NULL, NULL);
-	    if (!rv && conn) {
-		/* conn is ref'd for our convenience, but we don't want it */
-		g_object_unref(conn);
-		conn = NULL;
-	    }
-	    return conn;
-	}
-
-	%newobject accept_with_cond; /* connection is already ref'd, so we own it */
-	DirectTCPConnection *
-	accept_with_cond(GMutex *abort_mutex, GCond *abort_cond) {
-	    DirectTCPConnection *conn = NULL;
-	    gboolean rv;
-
-	    rv = device_accept_with_cond(self, &conn, abort_mutex, abort_cond);
-	    if (!rv && conn) {
-		/* conn is ref'd for our convenience, but we don't want it */
-		g_object_unref(conn);
-		conn = NULL;
-	    }
-	    return conn;
-	}
-
-	%newobject connect; /* connection is already ref'd, so we own it */
-	DirectTCPConnection *
-	connect(gboolean for_writing, DirectTCPAddr *addrs) {
-	    DirectTCPConnection *conn = NULL;
-	    gboolean rv;
-
-	    rv = device_connect(self, for_writing, addrs, &conn, NULL, NULL);
-	    if (!rv && conn) {
-		/* conn is ref'd for our convenience, but we don't want it */
-		g_object_unref(conn);
-		conn = NULL;
-	    }
-	    return conn;
-	}
-
-	%newobject connect_with_cond; /* connection is already ref'd, so we own it */
-	DirectTCPConnection *
-	connect_with_cond(gboolean for_writing, DirectTCPAddr *addrs,
-			  GMutex *abort_mutex, GCond *abort_cond) {
-	    DirectTCPConnection *conn = NULL;
-	    gboolean rv;
-
-	    rv = device_connect_with_cond(self, for_writing, addrs, &conn,
-					  abort_mutex, abort_cond);
-	    if (!rv && conn) {
-		/* conn is ref'd for our convenience, but we don't want it */
-		g_object_unref(conn);
-		conn = NULL;
-	    }
-	    return conn;
-	}
-
 	gboolean
 	use_connection(DirectTCPConnection *conn) {
 	    return device_use_connection(self, conn);
 	}
 
-	%typemap(in,numinputs=0) guint64 *actual_size (guint64 sz) {
-	    sz = 0;
-	    $1 = &sz;
-	}
-	%typemap(argout) guint64 *actual_size {
-	    SP += argvi; PUTBACK;
-	    $result = sv_2mortal(amglue_newSVu64(*$1));
-	    SPAGAIN; SP -= argvi; argvi++;
-	}
-	gboolean
-	write_from_connection(guint64 size, guint64 *actual_size) {
-	    return device_write_from_connection(self, size, actual_size);
-	}
-
-	gboolean
-	read_to_connection(guint64 size, guint64 *actual_size) {
-	    return device_read_to_connection(self, size, actual_size);
-	}
-
 	%typemap(out) const GSList * {
 	    GSList *iter;