[Gaim-commits] SF.net SVN: gaim: [17668] trunk/libgaim/protocols/qq

[<mar...@us...>]

Revision: 17668
          http://svn.sourceforge.net/gaim/?rev=17668&view=rev
Author:   markhuetsch
Date:     2006-11-04 16:11:52 -0800 (Sat, 04 Nov 2006)

Log Message:
-----------
Eliminate this union, as suggested by elb and nosnilmot.

Modified Paths:
--------------
    trunk/libgaim/protocols/qq/file_trans.c
    trunk/libgaim/protocols/qq/send_file.c
    trunk/libgaim/protocols/qq/send_file.h

Modified: trunk/libgaim/protocols/qq/file_trans.c
===================================================================
--- trunk/libgaim/protocols/qq/file_trans.c	2006-11-04 22:00:22 UTC (rev 17667)
+++ trunk/libgaim/protocols/qq/file_trans.c	2006-11-05 00:11:52 UTC (rev 17668)
@@ -218,8 +218,8 @@
 static int _qq_xfer_open_file(const gchar *filename, const gchar *method, GaimXfer *xfer)
 {
 	ft_info *info = xfer->data;
-	info->u.dest_fp = fopen(gaim_xfer_get_local_filename(xfer), method);
-	if (info->u.dest_fp == NULL) {
+	info->dest_fp = fopen(gaim_xfer_get_local_filename(xfer), method);
+	if (info->dest_fp == NULL) {
 		return -1;
 	}
 	return 0;
@@ -229,22 +229,22 @@
 {
 	ft_info *info = xfer->data;
 
-	fseek(info->u.dest_fp, index * len, SEEK_SET);
-	return fread(buffer, 1, len, info->u.dest_fp);
+	fseek(info->dest_fp, index * len, SEEK_SET);
+	return fread(buffer, 1, len, info->dest_fp);
 }
 
 static gint _qq_xfer_write_file(guint8 *buffer, guint index, guint len, GaimXfer *xfer)
 {
 	ft_info *info = xfer->data;
-	fseek(info->u.dest_fp, index * len, SEEK_SET);
-	return fwrite(buffer, 1, len, info->u.dest_fp);
+	fseek(info->dest_fp, index * len, SEEK_SET);
+	return fwrite(buffer, 1, len, info->dest_fp);
 }
 
 void qq_xfer_close_file(GaimXfer *xfer)
 {
 	ft_info *info = xfer->data;
 
-	if (info->u.dest_fp) fclose(info->u.dest_fp);
+	if (info->dest_fp) fclose(info->dest_fp);
 }
 #endif
 

Modified: trunk/libgaim/protocols/qq/send_file.c
===================================================================
--- trunk/libgaim/protocols/qq/send_file.c	2006-11-04 22:00:22 UTC (rev 17667)
+++ trunk/libgaim/protocols/qq/send_file.c	2006-11-05 00:11:52 UTC (rev 17668)
@@ -204,8 +204,8 @@
 	info = (ft_info *) xfer->data;
 
 	qq_xfer_close_file(xfer);
-	if (info->u.dest_fp != NULL) {
-		fclose(info->u.dest_fp);
+	if (info->dest_fp != NULL) {
+		fclose(info->dest_fp);
 		gaim_debug(GAIM_DEBUG_INFO, "QQ", "file closed\n");
 	}
 	if (info->major_fd != 0) {
@@ -217,8 +217,8 @@
 		gaim_debug(GAIM_DEBUG_INFO, "QQ", "minor port closed\n");
 	}
 	/*
-	if (info->u.buffer != NULL) {
-		munmap(info->u.buffer, gaim_xfer_get_size(xfer));
+	if (info->buffer != NULL) {
+		munmap(info->buffer, gaim_xfer_get_size(xfer));
 		gaim_debug(GAIM_DEBUG_INFO, "QQ", "file mapping buffer is freed.\n");
 	}
 	*/

Modified: trunk/libgaim/protocols/qq/send_file.h
===================================================================
--- trunk/libgaim/protocols/qq/send_file.h	2006-11-04 22:00:22 UTC (rev 17667)
+++ trunk/libgaim/protocols/qq/send_file.h	2006-11-05 00:11:52 UTC (rev 17668)
@@ -37,10 +37,8 @@
 	int minor_fd;
 	int sender_fd;
 	int recv_fd;
-	union {
-		FILE *dest_fp;
-		guint8 *buffer;
-	} u;
+	FILE *dest_fp;
+	/* guint8 *buffer; */
 	gboolean use_major;
 } ft_info;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.