Attachment #181018 for bug #257766

View | Details | Raw Unified | Return to bug 257766
Collapse All | Expand All

Lines 825-830 gam_client_conn_write(GIOChannel * sourc Link Here

(-)./server/gam_channel.c.dist (-1 / +3 lines)
825	{	825	{
826	int written;	826	int written;
827	int remaining;	827	int remaining;
		828	int tmp;
828		829
829	/**	830	/**
830	* Todo: check if write will block, or use non-blocking options	831	* Todo: check if write will block, or use non-blocking options
Lines 848-854 gam_client_conn_write(GIOChannel * sourc Link Here
848	return (FALSE);	849	return (FALSE);
849	}	850	}
850		851
851	data += written;	852	tmp = (int)data + written;
		853	data = (gpointer)tmp;
852	remaining -= written;	854	remaining -= written;
853	} while (remaining > 0);	855	} while (remaining > 0);
854		856

Lines 451-456 int Link Here

(-)./server/gam_connection.c.dist (-1 / +3 lines)
451	gam_connection_data(GamConnDataPtr conn, int len)	451	gam_connection_data(GamConnDataPtr conn, int len)
452	{	452	{
453	GAMPacketPtr req;	453	GAMPacketPtr req;
		454	GAMPacketPtr tmp;
454		455
455	g_assert(conn);	456	g_assert(conn);
456	g_assert(len >= 0);	457	g_assert(len >= 0);
Lines 521-527 gam_connection_data(GamConnDataPtr conn, Link Here
521	#if defined(__i386__) \|\| defined(__x86_64__)	522	#if defined(__i386__) \|\| defined(__x86_64__)
522	req = (void *) req + req->len;	523	req = (void *) req + req->len;
523	#else	524	#else
524	memmove(&conn->request, (void *)req + req->len, conn->request_len);	525	tmp = req + req->len;
		526	memmove(&conn->request, (void *) tmp, conn->request_len);
525	#endif	527	#endif
526	}	528	}
527		529

Return to bug 257766