/[pkgs]/devel/ORBit/ORBit-0.5.17-aligned-access.patch
ViewVC logotype

Contents of /devel/ORBit/ORBit-0.5.17-aligned-access.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.1 - (show annotations) (download) (as text)
Fri Jul 21 12:39:51 2006 UTC (3 years, 4 months ago) by pghmcfc
Branch: MAIN
CVS Tags: ORBit-0_5_17-25_fc11, F-12-split, ORBit-0_5_17-20_fc7, F-10-split, ORBit-0_5_17-23_fc9, ORBit-0_5_17-22_fc9, F-7-split, ORBit-0_5_17-24_fc11, F-11-split, ORBit-0_5_17-27_fc12, ORBit-0_5_17-26_fc12, F-8-split, ORBit-0_5_17-19_fc6, ORBit-0_5_17-18, ORBit-0_5_17-28_fc12, F-9-split, ORBit-0_5_17-18_fc6, FC-6-split, ORBit-0_5_17-21_fc7, HEAD
File MIME type: text/x-patch 
auto-import ORBit-0.5.17-18 on branch devel from ORBit-0.5.17-18.src.rpm
1 --- ORBit-0.5.17/src/orb/allocators.c.alignment 2003-04-01 18:51:46.000000000 -0500
2 +++ ORBit-0.5.17/src/orb/allocators.c 2003-04-02 05:28:36.000000000 -0500
3 @@ -185,9 +185,11 @@
4 case CORBA_tk_except:
5 case CORBA_tk_struct:
6 mem = ALIGN_ADDRESS (mem, ORBit_find_alignment (tc));
7 - for (i = 0; i < tc->sub_parts; i++)
8 + for (i = 0; i < tc->sub_parts; i++) {
9 + mem = ALIGN_ADDRESS (mem, ORBit_find_alignment (tc->subtypes[i]));
10 mem = ORBit_free_via_TypeCode (
11 mem, &tc->subtypes[i], CORBA_TRUE);
12 + }
13 retval = mem;
14 break;
15 case CORBA_tk_union: {
16 --- ORBit-0.5.17/src/orb/corba_any.c.alignment 2002-06-06 07:07:39.000000000 -0400
17 +++ ORBit-0.5.17/src/orb/corba_any.c 2003-04-02 06:35:53.000000000 -0500
18 @@ -169,6 +169,7 @@
19 case CORBA_tk_struct:
20 *val = ALIGN_ADDRESS(*val, ORBit_find_alignment(tc));
21 for(i = 0; i < tc->sub_parts; i++) {
22 + *val = ALIGN_ADDRESS(*val, ORBit_find_alignment(tc->subtypes[i]));
23 ORBit_marshal_value(buf, val, tc->subtypes[i], mi);
24 }
25 break;
26 @@ -197,9 +198,10 @@
27 }
28 break;
29 case CORBA_tk_wstring:
30 + *val = ALIGN_ADDRESS(*val, ALIGNOF_CORBA_POINTER);
31 +
32 ulval = strlen(*(char **)*val) + 1;
33
34 - *val = ALIGN_ADDRESS(*val, ALIGNOF_CORBA_POINTER);
35 giop_send_buffer_append_mem_indirect_a(buf,
36 &ulval,
37 sizeof(CORBA_unsigned_long));
38 @@ -208,10 +210,10 @@
39 *val = ((guchar *)*val) + sizeof(char *);
40 break;
41 case CORBA_tk_string:
42 - ulval = strlen(*(char **)*val) + 1;
43 -
44 *val = ALIGN_ADDRESS(*val, ALIGNOF_CORBA_POINTER);
45
46 + ulval = strlen(*(char **)*val) + 1;
47 +
48 giop_send_buffer_append_mem_indirect_a(buf,
49 &ulval,
50 sizeof(CORBA_unsigned_long));
51 @@ -595,6 +597,7 @@
52 case CORBA_tk_struct:
53 *val = ALIGN_ADDRESS(*val, ORBit_find_alignment(tc));
54 for(i = 0; i < tc->sub_parts; i++) {
55 + *val = ALIGN_ADDRESS(*val, ORBit_find_alignment(tc->subtypes[i]));
56 ORBit_demarshal_value(buf, val, tc->subtypes[i], dup_strings, orb);
57 }
58 break;
59 @@ -820,6 +823,8 @@
60 *val = ALIGN_ADDRESS(*val, ORBit_find_alignment(tc));
61 *newval = ALIGN_ADDRESS(*newval, ORBit_find_alignment(tc));
62 for(i = 0; i < tc->sub_parts; i++) {
63 + *val = ALIGN_ADDRESS(*val, ORBit_find_alignment(tc->subtypes[i]));
64 + *newval = ALIGN_ADDRESS(*newval, ORBit_find_alignment(tc->subtypes[i]));
65 _ORBit_copy_value(val, newval, tc->subtypes[i]);
66 }
67 break;
68 --- ORBit-0.5.17/src/orb/orbit.c.alignment 2003-04-01 19:02:40.000000000 -0500
69 +++ ORBit-0.5.17/src/orb/orbit.c 2003-04-02 06:33:28.000000000 -0500
70 @@ -230,9 +230,12 @@
71 *a = ALIGN_ADDRESS (*a, ORBit_find_alignment (tc));
72 *b = ALIGN_ADDRESS (*b, ORBit_find_alignment (tc));
73
74 - for (i = 0; i < tc->sub_parts; i++)
75 + for (i = 0; i < tc->sub_parts; i++) {
76 + *a = ALIGN_ADDRESS (*a, ORBit_find_alignment (tc->subtypes[i]));
77 + *b = ALIGN_ADDRESS (*b, ORBit_find_alignment (tc->subtypes[i]));
78 if (!ORBit_value_equivalent (a, b, tc->subtypes [i], ev))
79 return FALSE;
80 + }
81
82 return TRUE;
83 }
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2