From 2b933fb2d02b8d9a577324ccb209dc99d38517fc Mon Sep 17 00:00:00 2001 From: olgeni Date: Fri, 28 May 2004 14:41:46 +0000 Subject: Upgrade to version R9C-1. --- .../files/patch-lib_debugger_src_dbg__ui__mon.erl | 14 ---- .../patch-lib_debugger_src_dbg__ui__trace.erl | 14 ---- .../files/patch-lib_debugger_src_dbg__ui__view.erl | 14 ---- ...ib_erl__interface_src_decode_decode__longlong.c | 14 ---- .../files/patch-lib_stdlib_src_dets__v9.erl | 77 ---------------------- 5 files changed, 133 deletions(-) delete mode 100644 lang/erlang14/files/patch-lib_debugger_src_dbg__ui__mon.erl delete mode 100644 lang/erlang14/files/patch-lib_debugger_src_dbg__ui__trace.erl delete mode 100644 lang/erlang14/files/patch-lib_debugger_src_dbg__ui__view.erl delete mode 100644 lang/erlang14/files/patch-lib_erl__interface_src_decode_decode__longlong.c delete mode 100644 lang/erlang14/files/patch-lib_stdlib_src_dets__v9.erl (limited to 'lang/erlang14/files') diff --git a/lang/erlang14/files/patch-lib_debugger_src_dbg__ui__mon.erl b/lang/erlang14/files/patch-lib_debugger_src_dbg__ui__mon.erl deleted file mode 100644 index 68b5cad41d74..000000000000 --- a/lang/erlang14/files/patch-lib_debugger_src_dbg__ui__mon.erl +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- lib/debugger/src/dbg_ui_mon.erl.orig Thu Sep 4 22:26:08 2003 -+++ lib/debugger/src/dbg_ui_mon.erl Thu Sep 4 22:26:51 2003 -@@ -379,7 +379,7 @@ - - %% Help Menu - gui_cmd('Debugger', State) -> -- HelpFile = filename:join([code:lib_dir(debugger),"doc","index.html"]), -+ HelpFile = filename:join([code:lib_dir(debugger),"doc","html","index.html"]), - tool_utils:open_help(State#state.gs, HelpFile), - State; - diff --git a/lang/erlang14/files/patch-lib_debugger_src_dbg__ui__trace.erl b/lang/erlang14/files/patch-lib_debugger_src_dbg__ui__trace.erl deleted file mode 100644 index b8a009679ad5..000000000000 --- a/lang/erlang14/files/patch-lib_debugger_src_dbg__ui__trace.erl +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- lib/debugger/src/dbg_ui_trace.erl.orig Thu Sep 4 22:26:12 2003 -+++ lib/debugger/src/dbg_ui_trace.erl Thu Sep 4 22:26:56 2003 -@@ -352,7 +352,7 @@ - - %% Help menu - gui_cmd('Debugger', State) -> -- HelpFile = filename:join([code:lib_dir(debugger),"doc","index.html"]), -+ HelpFile = filename:join([code:lib_dir(debugger),"doc","html","index.html"]), - tool_utils:open_help(State#state.gs, HelpFile), - State; - diff --git a/lang/erlang14/files/patch-lib_debugger_src_dbg__ui__view.erl b/lang/erlang14/files/patch-lib_debugger_src_dbg__ui__view.erl deleted file mode 100644 index 825ccb15044f..000000000000 --- a/lang/erlang14/files/patch-lib_debugger_src_dbg__ui__view.erl +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- lib/debugger/src/dbg_ui_view.erl.orig Thu Sep 4 22:26:16 2003 -+++ lib/debugger/src/dbg_ui_view.erl Thu Sep 4 22:29:05 2003 -@@ -165,7 +165,7 @@ - - %% Help menu - gui_cmd('Debugger', State) -> -- HelpFile = filename:join([code:lib_dir(debugger),"doc","index.html"]), -+ HelpFile = filename:join([code:lib_dir(debugger),"doc","html","index.html"]), - tool_utils:open_help(State#state.gs, HelpFile), - State. - diff --git a/lang/erlang14/files/patch-lib_erl__interface_src_decode_decode__longlong.c b/lang/erlang14/files/patch-lib_erl__interface_src_decode_decode__longlong.c deleted file mode 100644 index ce5e84161b1d..000000000000 --- a/lang/erlang14/files/patch-lib_erl__interface_src_decode_decode__longlong.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- lib/erl_interface/src/decode/decode_longlong.c.orig Sun Aug 31 14:00:44 2003 -+++ lib/erl_interface/src/decode/decode_longlong.c Sun Aug 31 14:01:41 2003 -@@ -51,7 +51,7 @@ - int pos, shift = 0; - n = 0; - for (pos = 0; pos < arity; pos++) { -- n |= get8(s) << shift; -+ n |= ((EI_LONGLONG) get8(s)) << shift; - shift += 8; - } - } diff --git a/lang/erlang14/files/patch-lib_stdlib_src_dets__v9.erl b/lang/erlang14/files/patch-lib_stdlib_src_dets__v9.erl deleted file mode 100644 index fefd4c99f680..000000000000 --- a/lang/erlang14/files/patch-lib_stdlib_src_dets__v9.erl +++ /dev/null @@ -1,77 +0,0 @@ - -$FreeBSD$ - ---- lib/stdlib/src/dets_v9.erl.orig Mon Jul 7 14:17:44 2003 -+++ lib/stdlib/src/dets_v9.erl Fri Dec 26 14:58:33 2003 -@@ -212,7 +212,6 @@ - -define(FREELIST_POS, 0). - -define(CLOSED_PROPERLY_POS, 8). - -define(D_POS, 20). ---define(NO_KEYS_POS, (?D_POS + 16)). - - %%% Dets file versions up to 8 are handled in dets_v8. This module - %%% handles version 9, introduced in R8. -@@ -416,7 +415,7 @@ - alloc_part(Head, SegZero, PartPos), - {NewHead, InitSegment, [SegPointer]} = - alloc_seg(Head1, SegZero, SegNo, Part), -- {NewHead, InitSegment, [SegPointer, InitArrPart, ArrPartPointer]}; -+ {NewHead, InitSegment, [InitArrPart, SegPointer, ArrPartPointer]}; - Part -> - alloc_seg(Head, SegZero, SegNo, Part) - end. -@@ -1222,7 +1221,7 @@ - %% Note that space for the array parts and the segments has - %% already been allocated, but the segments have not been - %% initialized on disk. -- NoParts = no_parts(Head#head.m), -+ NoParts = no_parts(Head#head.next), - %% All parts first, ensured by init_segments/6. - Addr = ?BASE + NoParts * 4 * ?SEGPARTSZ, - {Head, [{?FSCK_SEGMENT,Addr,Data,0} | L]}; -@@ -1586,7 +1585,11 @@ - {FLW, FLSize} = free_lists_to_file(H1), - FileSize = FreeListsPointer + FLSize + 4, - ok = dets_utils:write(H, [FLW | <>]), -- NoColls = case H1#head.no_collections of -+ FileHeader = file_header(H1, FreeListsPointer, ?CLOSED_PROPERLY), -+ dets_utils:pwrite(H1, [{0, FileHeader}]). -+ -+file_header(Head, FreeListsPointer, ClosedProperly) -> -+ NoColls = case Head#head.no_collections of - undefined -> []; - NC -> NC - end, -@@ -1594,8 +1597,7 @@ - NoColls, - lists:map(fun(X) -> {X,0} end, lists:seq(4,?MAXBUD-1))), - CW = lists:map(fun({_LSz,N}) -> <> end, L), -- FileHeader = file_header(H1, FreeListsPointer, ?CLOSED_PROPERLY, CW), -- dets_utils:pwrite(H1, [{0, FileHeader}]). -+ file_header(Head, FreeListsPointer, ClosedProperly, CW). - - file_header(Head, FreeListsPointer, ClosedProperly, NoColls) -> - Cookie = ?MAGIC, -@@ -2356,17 +2358,18 @@ - update_no_keys(Head, Ws, DeltaObjects, DeltaKeys) -> - NoKeys = Head#head.no_keys, - NewNoKeys = NoKeys + DeltaKeys, -+ NewNoObject = Head#head.no_objects + DeltaObjects, -+ NewHead = Head#head{no_objects = NewNoObject, no_keys = NewNoKeys}, - NWs = - if -- NewNoKeys > Head#head.max_no_slots -> -+ NewNoKeys > NewHead#head.max_no_slots -> - Ws; - NoKeys div ?SEGSZP == NewNoKeys div ?SEGSZP -> - Ws; - true -> -- [{?NO_KEYS_POS, <>} | Ws] -+ [{0, file_header(NewHead, 0, ?NOT_PROPERLY_CLOSED)} | Ws] - end, -- NewNoObject = Head#head.no_objects + DeltaObjects, -- {Head#head{no_objects = NewNoObject, no_keys = NewNoKeys}, NWs}. -+ {NewHead, NWs}. - - slot_position(S) -> - SegNo = ?SLOT2SEG(S), % S div ?SEGSZP -- cgit