From 8ff3147463657d165924917a54746db42013dd89 Mon Sep 17 00:00:00 2001 From: ygrek Date: Wed, 31 Dec 2014 01:44:36 +0800 Subject: [PATCH] fix some "deprecated" warnings --- src/daemon/common/commonBlocking.ml | 2 +- src/daemon/common/commonGlobals.ml | 4 ++-- src/daemon/common/commonSources.ml | 14 +++++++------- src/daemon/common/commonSwarming.ml | 32 ++++++++++++++++---------------- src/daemon/common/commonUploads.ml | 4 ++-- src/daemon/common/guiEncoding.ml | 2 +- src/daemon/driver/driverInteractive.ml | 4 ++-- src/daemon/driver/driverInterface.ml | 8 ++++---- src/gtk/gpattern/gpattern.ml | 16 ++++++++-------- src/gtk/gui/gui_com.ml | 4 ++-- src/gtk/newgui/gui_com.ml | 4 ++-- src/gtk/newgui/gui_graph.ml | 24 ++++++++++++------------ src/gtk2/gui/graphTypes.ml | 8 ++++---- src/gtk2/gui/guiCom.ml | 4 ++-- src/networks/bittorrent/bTTorrent.ml | 2 +- src/networks/donkey/donkeyMftp.ml | 2 +- src/networks/donkey/donkeyProtoClient.ml | 4 ++-- src/networks/gnutella/gnutellaClients.ml | 2 +- src/networks/gnutella/gnutellaProto.ml | 4 ++-- src/networks/gnutella2/g2Proto.ml | 4 ++-- src/networks/soulseek/slskProtocol.ml | 4 ++-- src/utils/cdk/hashtbl2.ml | 2 +- src/utils/cdk/string2.ml | 2 +- src/utils/lib/bitv.ml | 26 +++++++++++++------------- src/utils/lib/fifo.ml | 18 +++++++++--------- src/utils/lib/gettext.ml4 | 8 ++++---- src/utils/lib/indexer.ml | 2 +- src/utils/lib/indexer2.ml | 6 +++--- src/utils/lib/store.ml | 4 ++-- src/utils/lib/unix32.ml | 4 ++-- src/utils/net/base64.ml | 16 ++++++++-------- src/utils/net/ip_set.ml | 2 +- src/utils/net/tcpBufferedSocket.ml | 6 +++--- tools/observer.ml | 4 ++-- tools/xpm.mll | 4 ++-- 35 files changed, 128 insertions(+), 128 deletions(-) diff --git a/src/daemon/common/commonBlocking.ml b/src/daemon/common/commonBlocking.ml index 31f502e5..e68b724f 100644 --- a/src/daemon/common/commonBlocking.ml +++ b/src/daemon/common/commonBlocking.ml @@ -29,7 +29,7 @@ let ip_blocking_list = ref Ip_set.bl_empty let web_ip_blocking_list = ref Ip_set.bl_empty let country_blocking_block = ref false let country_blocking_list = - Array.create (Array.length Geoip.country_code_array) false + Array.make (Array.length Geoip.country_code_array) false (* Keep a copy of valid values from !!ip_blocking_countries to check if geoip_hit needs really to compute the country code. diff --git a/src/daemon/common/commonGlobals.ml b/src/daemon/common/commonGlobals.ml index 5153daad..02c0b5d7 100644 --- a/src/daemon/common/commonGlobals.ml +++ b/src/daemon/common/commonGlobals.ml @@ -592,7 +592,7 @@ let update_upload_history () = done let update_h_download_history () = - if (!history_h_step = history_size * history_step) or ( (Fifo.length download_history) <= (!history_size_for_h_graph+1)) then + if (!history_h_step = history_size * history_step) || ( (Fifo.length download_history) <= (!history_size_for_h_graph+1)) then Fifo.put download_h_history ((List.fold_left (+) 0 (Fifo.to_list download_history)) / ((Fifo.length download_history))) else Fifo.put download_h_history ((List.fold_left (+) 0 @@ -606,7 +606,7 @@ let update_h_download_history () = let update_h_upload_history () = (* Fifo.put upload_h_history ((Fifo.length upload_history) / 720); *) - if (!history_h_step = history_size * history_step) or ((Fifo.length upload_history) <= (!history_size_for_h_graph+1)) then + if (!history_h_step = history_size * history_step) || ((Fifo.length upload_history) <= (!history_size_for_h_graph+1)) then Fifo.put upload_h_history ((List.fold_left (+) 0 (Fifo.to_list upload_history)) / ((Fifo.length upload_history))) else Fifo.put upload_h_history ((List.fold_left (+) 0 diff --git a/src/daemon/common/commonSources.ml b/src/daemon/common/commonSources.ml index 56d71755..c6d3777e 100644 --- a/src/daemon/common/commonSources.ml +++ b/src/daemon/common/commonSources.ml @@ -115,7 +115,7 @@ let queue_name = [| let nqueues = Array.length queue_name -let queue_period = Array.create nqueues 600 +let queue_period = Array.make nqueues 600 let () = queue_period.(new_sources_queue) <- 0; @@ -527,10 +527,10 @@ module Make(M: let list_sum = List.fold_left (+) 0 in - let nsources_per_queue = Array.create nqueues 0 in - let nready_per_queue = Array.create nqueues 0 in - let nindirect_per_queue = Array.create nqueues 0 in - let ninvalid_per_queue = Array.create nqueues 0 in + let nsources_per_queue = Array.make nqueues 0 in + let nready_per_queue = Array.make nqueues 0 in + let nindirect_per_queue = Array.make nqueues 0 in + let ninvalid_per_queue = Array.make nqueues 0 in let nall = ref 0 in let naact = ref 0 in let naneed = ref 0 in @@ -2015,8 +2015,8 @@ connected if needed *) let () = Heap.add_memstat M.module_name (fun level buf -> - let nsources_per_queue = Array.create nqueues 0 in - let nready_per_queue = Array.create nqueues 0 in + let nsources_per_queue = Array.make nqueues 0 in + let nready_per_queue = Array.make nqueues 0 in List.iter (fun m -> for i = 0 to nqueues -1 do let q = m.manager_sources.(i) in diff --git a/src/daemon/common/commonSwarming.ml b/src/daemon/common/commonSwarming.ml index 5336eb96..804d61d0 100644 --- a/src/daemon/common/commonSwarming.ml +++ b/src/daemon/common/commonSwarming.ml @@ -710,11 +710,11 @@ let create_swarmer file_name file_size = s_priorities_bitmap = String.make nblocks priority_zero; s_priorities_intervals = [(zero, 1)]; (* JAVE init all prios to 1, thus all chunks will be downloaded as usual *) s_disk_allocated = Bitv.create ndiskblocks false; - s_blocks = Array.create nblocks EmptyBlock ; - s_block_pos = Array.create nblocks zero; - s_availability = Array.create nblocks 0; - s_nuploading = Array.create nblocks 0; -(* s_last_seen = Array.create nblocks 0; *) + s_blocks = Array.make nblocks EmptyBlock ; + s_block_pos = Array.make nblocks zero; + s_availability = Array.make nblocks 0; + s_nuploading = Array.make nblocks 0; +(* s_last_seen = Array.make nblocks 0; *) } in swarmer_recompute_priorities_bitmap s; @@ -838,13 +838,13 @@ let split_blocks s chunk_size = if Array2.exists ((<>) 0) s.s_nuploading then lprintf_nl "WARNING: splitting a swarmer beging uploaded to"; - s.s_blocks <- Array.create nblocks EmptyBlock; + s.s_blocks <- Array.make nblocks EmptyBlock; s.s_verified_bitmap <- VB.create nblocks VB.State_missing; s.s_priorities_bitmap <- String.make nblocks priority_zero; - s.s_block_pos <- Array.create nblocks zero; - s.s_availability <- Array.create nblocks 0; (* not preserved ? *) - s.s_nuploading <- Array.create nblocks 0; (* not preserved ? *) -(* s.s_last_seen <- Array.create nblocks 0; *) + s.s_block_pos <- Array.make nblocks zero; + s.s_availability <- Array.make nblocks 0; (* not preserved ? *) + s.s_nuploading <- Array.make nblocks 0; (* not preserved ? *) +(* s.s_last_seen <- Array.make nblocks 0; *) let rec iter i list = match list with @@ -894,9 +894,9 @@ let associate is_primary t s = t.t_s <- s; t.t_converted_verified_bitmap <- VB.create t.t_nchunks VB.State_missing; - t.t_last_seen <- Array.create t.t_nchunks 0; + t.t_last_seen <- Array.make t.t_nchunks 0; t.t_chunk_of_block <- [||]; - t.t_blocks_of_chunk <- Array.create t.t_nchunks []; + t.t_blocks_of_chunk <- Array.make t.t_nchunks []; (* invariant: primary frontend is at the head of swarmer's [s_networks], and is the first associated with the swarmer *) @@ -934,8 +934,8 @@ the t_chunk_of_block and t_blocks_of_chunk fields. *) (* For all networks, adjust the chunks and mappings *) List.iter (fun t -> let nchunks = VB.length t.t_converted_verified_bitmap in - t.t_chunk_of_block <- Array.create nblocks 0; - t.t_blocks_of_chunk <- Array.create nchunks []; + t.t_chunk_of_block <- Array.make nblocks 0; + t.t_blocks_of_chunk <- Array.make nchunks []; let chunk_size = t.t_chunk_size in for i = 0 to nblocks - 1 do @@ -983,13 +983,13 @@ let create ss file chunk_size = t_nverified_chunks = 0; t_converted_verified_bitmap = VB.create nchunks VB.State_missing; - t_last_seen = Array.create nchunks 0; + t_last_seen = Array.make nchunks 0; t_verifier = NoVerification; t_verified = (fun _ _ -> ()); t_chunk_of_block = [||]; - t_blocks_of_chunk = Array.create nchunks []; + t_blocks_of_chunk = Array.make nchunks []; } in HT.add frontends_by_num t; diff --git a/src/daemon/common/commonUploads.ml b/src/daemon/common/commonUploads.ml index 49cd387d..da6b02d6 100644 --- a/src/daemon/common/commonUploads.ml +++ b/src/daemon/common/commonUploads.ml @@ -399,7 +399,7 @@ let flatten_tiger_array array = let unflatten_tiger_array s = let len = String.length s / TigerTree.length in - let array = Array.create len TigerTree.null in + let array = Array.make len TigerTree.null in for i = 0 to len - 1 do array.(i) <- TigerTree.direct_of_string (String.sub s (i * TigerTree.length) TigerTree.length) @@ -409,7 +409,7 @@ let unflatten_tiger_array s = let make_tiger_tree array = let len = Array.length array in let pos, list = tiger_pos2 len in - let s = Array.create (pos + len) TigerTree.null in + let s = Array.make (pos + len) TigerTree.null in for i = 0 to len - 1 do s.(pos+i) <- array.(i) done; diff --git a/src/daemon/common/guiEncoding.ml b/src/daemon/common/guiEncoding.ml index 49c1b66a..e613f530 100644 --- a/src/daemon/common/guiEncoding.ml +++ b/src/daemon/common/guiEncoding.ml @@ -1324,7 +1324,7 @@ let _ = for best_gui_version = best_gui_version downto 24 do (* lprintf "best_gui_version: %d\n" best_gui_version; *) - let proto = Array.create (to_gui_last_opcode+1) best_gui_version in + let proto = Array.make (to_gui_last_opcode+1) best_gui_version in let to_gui = to_gui proto in let check_to_gui = check to_gui (GuiDecoding.to_gui proto) in diff --git a/src/daemon/driver/driverInteractive.ml b/src/daemon/driver/driverInteractive.ml index 38bb9dfe..de34e782 100644 --- a/src/daemon/driver/driverInteractive.ml +++ b/src/daemon/driver/driverInteractive.ml @@ -364,7 +364,7 @@ let print_table_text buf alignments titles lines = if len > !max_cols then max_cols := len ) lines; let ncols = !max_cols in - let cols = Array.create ncols 0 in + let cols = Array.make ncols 0 in List.iter (fun line -> let len = Array.length line in for i = 0 to len-1 do @@ -377,7 +377,7 @@ let print_table_text buf alignments titles lines = Buffer.add_string buf col_sep; ) titles; Buffer.add_char buf '\n'; - let aligns = Array.create ncols Align_Center in + let aligns = Array.make ncols Align_Center in Array.iteri (fun i al -> aligns.(i) <- al) alignments; List.iter (fun line -> let len = Array.length line in diff --git a/src/daemon/driver/driverInterface.ml b/src/daemon/driver/driverInterface.ml index 741d02ae..c9be27d8 100644 --- a/src/daemon/driver/driverInterface.ml +++ b/src/daemon/driver/driverInterface.ml @@ -533,9 +533,9 @@ let gui_reader (gui: gui_record) t _ = | GuiProtocol version -> let version = min GuiProto.best_gui_version version in - gui.gui_proto_to_gui_version <- Array.create + gui.gui_proto_to_gui_version <- Array.make (to_gui_last_opcode + 1) version; - gui.gui_proto_from_gui_version <- Array.create + gui.gui_proto_from_gui_version <- Array.make (from_gui_last_opcode + 1) version; if not !verbose_no_login then lprintf_nl "GUI protocol %d" version @@ -1159,8 +1159,8 @@ let new_gui gui_send gui_auth sock gui_type = gui_sock = sock; gui_search_nums = []; gui_events = gui_events (); - gui_proto_to_gui_version = Array.create (to_gui_last_opcode+1) 0; - gui_proto_from_gui_version = Array.create (from_gui_last_opcode+1) 0; + gui_proto_to_gui_version = Array.make (to_gui_last_opcode+1) 0; + gui_proto_from_gui_version = Array.make (from_gui_last_opcode+1) 0; gui_num = !gui_counter; gui_auth = gui_auth; gui_poll = false; diff --git a/src/gtk/gpattern/gpattern.ml b/src/gtk/gpattern/gpattern.ml index c7d0823e..418ead57 100644 --- a/src/gtk/gpattern/gpattern.ml +++ b/src/gtk/gpattern/gpattern.ml @@ -318,9 +318,9 @@ class virtual ['a] filtered_plist method private add_hidden_item i = if nitems = Array.length items then begin let nis = nitems * 2 + 8 in - let is = Array.create nis i in + let is = Array.make nis i in Array.blit items 0 is 0 nitems; - contents <- Array.create nis dummy_line; + contents <- Array.make nis dummy_line; items <- is end else begin items.(nitems) <- i; @@ -604,11 +604,11 @@ class virtual ['a] filtered_ptree ) l; let length = Array.length !array_of_children in let new_nitems = nitems + length in - let new_items = Array.create new_nitems {data = i.data; children = []} in + let new_items = Array.make new_nitems {data = i.data; children = []} in Array.blit items 0 new_items 0 (row + 1); Array.blit !array_of_children 0 new_items (row + 1) length; Array.blit items (row + 1) new_items (row + length + 1) (nitems - row - 1); - let new_contents = Array.create new_nitems dummy_line in + let new_contents = Array.make new_nitems dummy_line in Array.blit contents 0 new_contents 0 (row + 1); Array.blit contents row new_contents (row + length + 1) (nitems - row - 1); nitems <- new_nitems; @@ -631,10 +631,10 @@ class virtual ['a] filtered_ptree let (row, _) = self#find (get_key i) in let length = List.assoc (get_key i) is_expanded in let new_nitems = nitems - length in - let new_items = Array.create new_nitems {data = i.data; children = []} in + let new_items = Array.make new_nitems {data = i.data; children = []} in Array.blit items 0 new_items 0 (row + 1); Array.blit items (row + length + 1) new_items (row + 1) (nitems - row - length - 1); - let new_contents = Array.create new_nitems dummy_line in + let new_contents = Array.make new_nitems dummy_line in Array.blit contents 0 new_contents 0 (row + 1); Array.blit contents (row + length + 1) new_contents (row + 1) (nitems - row - length - 1); nitems <- new_nitems; @@ -822,9 +822,9 @@ class virtual ['a] filtered_ptree method private add_hidden_item i = if nitems = Array.length items then begin let nis = nitems * 2 + 8 in - let is = Array.create nis i in + let is = Array.make nis i in Array.blit items 0 is 0 nitems; - contents <- Array.create nis dummy_line; + contents <- Array.make nis dummy_line; items <- is end else begin items.(nitems) <- i; diff --git a/src/gtk/gui/gui_com.ml b/src/gtk/gui/gui_com.ml index 1736fdea..2b9d688e 100644 --- a/src/gtk/gui/gui_com.ml +++ b/src/gtk/gui/gui_com.ml @@ -41,9 +41,9 @@ let when_disconnected gui = G.clear () -let to_gui_protocol_used = Array.create (to_gui_last_opcode+1) +let to_gui_protocol_used = Array.make (to_gui_last_opcode+1) GuiProto.best_gui_version -let from_gui_protocol_used = Array.create +let from_gui_protocol_used = Array.make (from_gui_last_opcode+1) GuiProto.best_gui_version diff --git a/src/gtk/newgui/gui_com.ml b/src/gtk/newgui/gui_com.ml index 2656a8da..4edfccb7 100644 --- a/src/gtk/newgui/gui_com.ml +++ b/src/gtk/newgui/gui_com.ml @@ -47,9 +47,9 @@ let when_disconnected (gui : gui) = G.clear () -let to_gui_protocol_used = Array.create (to_gui_last_opcode+1) +let to_gui_protocol_used = Array.make (to_gui_last_opcode+1) GuiProto.best_gui_version -let from_gui_protocol_used = Array.create +let from_gui_protocol_used = Array.make (from_gui_last_opcode+1) GuiProto.best_gui_version diff --git a/src/gtk/newgui/gui_graph.ml b/src/gtk/newgui/gui_graph.ml index 4bf18fad..1f4d2b27 100644 --- a/src/gtk/newgui/gui_graph.ml +++ b/src/gtk/newgui/gui_graph.ml @@ -78,25 +78,25 @@ they will be merged further with the pixmap "body" when we will call pixmap_from_xpm_d *) let set_downloads_pixmap_headers w h col1 col2 = let header = - Array.create 1 (Printf.sprintf "%d %d 3 1" w h) in + Array.make 1 (Printf.sprintf "%d %d 3 1" w h) in let color_none = - Array.create 1 (Printf.sprintf ". c None") in + Array.make 1 (Printf.sprintf ". c None") in let color1 = - Array.create 1 ((Printf.sprintf "a c ") ^ col1) in + Array.make 1 ((Printf.sprintf "a c ") ^ col1) in let color2 = - Array.create 1 ((Printf.sprintf "b c ") ^ col2) in + Array.make 1 ((Printf.sprintf "b c ") ^ col2) in downloads_pixmap_headers := Some (Array.concat [header;color_none;color1;color2]) let set_uploads_pixmap_headers w h col1 col2 = let header = - Array.create 1 (Printf.sprintf "%d %d 3 1" w h) in + Array.make 1 (Printf.sprintf "%d %d 3 1" w h) in let color_none = - Array.create 1 (Printf.sprintf ". c None") in + Array.make 1 (Printf.sprintf ". c None") in let color1 = - Array.create 1 ((Printf.sprintf "a c ") ^ col1) in + Array.make 1 ((Printf.sprintf "a c ") ^ col1) in let color2 = - Array.create 1 ((Printf.sprintf "b c ") ^ col2) in + Array.make 1 ((Printf.sprintf "b c ") ^ col2) in uploads_pixmap_headers := Some (Array.concat [header;color_none;color1;color2]) @@ -501,7 +501,7 @@ class box () = download_rate_range := d; download_timeout := (!download_time_range * 1000 / !width ); downloads_pixmap := - Some (Array.create !height (String.make !width '.')) (*; + Some (Array.make !height (String.make !width '.')) (*; Printf.printf "DOWNLOADS GRAPH PROPERTIES HAVE CHANGED\ndownload_timeout : %d\n" !download_timeout; flush stdout*) @@ -516,7 +516,7 @@ class box () = upload_rate_range := d; upload_timeout := (!upload_time_range * 1000 / !width ); uploads_pixmap := - Some (Array.create !height (String.make !width '.')) (*; + Some (Array.make !height (String.make !width '.')) (*; Printf.printf "UPLOADS GRAPH PROPERTIES HAVE CHANGED\nupload_timeout : %d\n" !upload_timeout; flush stdout*) @@ -530,14 +530,14 @@ class box () = match !downloads_pixmap with None -> downloads_pixmap := - Some (Array.create !height (String.make !width '.')); + Some (Array.make !height (String.make !width '.')); | _ -> () in let () = match !uploads_pixmap with None -> uploads_pixmap := - Some (Array.create !height (String.make !width '.')); + Some (Array.make !height (String.make !width '.')); | _ -> () in draw_downloads (); diff --git a/src/gtk2/gui/graphTypes.ml b/src/gtk2/gui/graphTypes.ml index a078fdd1..16af3dce 100644 --- a/src/gtk2/gui/graphTypes.ml +++ b/src/gtk2/gui/graphTypes.ml @@ -156,7 +156,7 @@ module GStack = struct if q.gstack_empty then [||] else begin - let r = Array.create (q.gstack_inpos - q.gstack_outpos) (f(Array.unsafe_get q.gstack_queue q.gstack_outpos)) in + let r = Array.make (q.gstack_inpos - q.gstack_outpos) (f(Array.unsafe_get q.gstack_queue q.gstack_outpos)) in for i = q.gstack_outpos to q.gstack_inpos - 1 do Array.unsafe_set r (i - q.gstack_outpos) (f(Array.unsafe_get q.gstack_queue i)) done; @@ -167,7 +167,7 @@ module GStack = struct if q.gstack_empty then [||] else begin - let r = Array.create (q.gstack_inpos - q.gstack_outpos) (f(Array.unsafe_get q.gstack_queue (q.gstack_inpos - 1))) in + let r = Array.make (q.gstack_inpos - q.gstack_outpos) (f(Array.unsafe_get q.gstack_queue (q.gstack_inpos - 1))) in for i = q.gstack_inpos - 1 downto q.gstack_outpos do Array.unsafe_set r (i - q.gstack_outpos) (f(Array.unsafe_get q.gstack_queue i)) done; @@ -178,7 +178,7 @@ module GStack = struct if q.gstack_empty then [||] else begin - let r = Array.create (q.gstack_inpos - q.gstack_outpos) (f 0 (Array.unsafe_get q.gstack_queue q.gstack_outpos)) in + let r = Array.make (q.gstack_inpos - q.gstack_outpos) (f 0 (Array.unsafe_get q.gstack_queue q.gstack_outpos)) in for i = q.gstack_outpos to q.gstack_inpos - 1 do Array.unsafe_set r (i - q.gstack_outpos) (f (i - q.gstack_outpos) (Array.unsafe_get q.gstack_queue i)) done; @@ -189,7 +189,7 @@ module GStack = struct if q.gstack_empty then [||] else begin - let r = Array.create (q.gstack_inpos - q.gstack_outpos) (f 0 (Array.unsafe_get q.gstack_queue (q.gstack_inpos - 1))) in + let r = Array.make (q.gstack_inpos - q.gstack_outpos) (f 0 (Array.unsafe_get q.gstack_queue (q.gstack_inpos - 1))) in for i = q.gstack_inpos - 1 downto q.gstack_outpos do Array.unsafe_set r (i - q.gstack_outpos) (f (i - q.gstack_outpos) (Array.unsafe_get q.gstack_queue i)) done; diff --git a/src/gtk2/gui/guiCom.ml b/src/gtk2/gui/guiCom.ml index 76ea5353..83541c2b 100644 --- a/src/gtk2/gui/guiCom.ml +++ b/src/gtk2/gui/guiCom.ml @@ -44,9 +44,9 @@ let when_disconnected (gui : gui) = gui.clear () -let to_gui_protocol_used = Array.create (to_gui_last_opcode+1) +let to_gui_protocol_used = Array.make (to_gui_last_opcode+1) GuiProto.best_gui_version -let from_gui_protocol_used = Array.create +let from_gui_protocol_used = Array.make (from_gui_last_opcode+1) GuiProto.best_gui_version diff --git a/src/networks/bittorrent/bTTorrent.ml b/src/networks/bittorrent/bTTorrent.ml index dd306658..72522f74 100644 --- a/src/networks/bittorrent/bTTorrent.ml +++ b/src/networks/bittorrent/bTTorrent.ml @@ -416,7 +416,7 @@ let make_torrent announce filename comment is_private = Unix32.flush_fd t; let length = Unix32.getsize64 t in let npieces = 1+ Int64.to_int ((length -- one) // chunk_size) in - let pieces = Array.create npieces Sha1.null in + let pieces = Array.make npieces Sha1.null in for i = 0 to npieces - 1 do let begin_pos = chunk_size *.. i in diff --git a/src/networks/donkey/donkeyMftp.ml b/src/networks/donkey/donkeyMftp.ml index da7eaf9d..cd5ff85c 100644 --- a/src/networks/donkey/donkeyMftp.ml +++ b/src/networks/donkey/donkeyMftp.ml @@ -167,7 +167,7 @@ let get_tag (names_of_tag : (string * field) list) s pos = Uint16 v, pos2 + 2 | 9 -> let v = get_uint8 s pos2 in Uint8 v, pos2 + 1 - | _ when t >= 0x11 & t <= 0x20 -> let v = String.sub s pos2 (t-0x10) in + | _ when t >= 0x11 && t <= 0x20 -> let v = String.sub s pos2 (t-0x10) in String v, pos2 + t - 0x10 | _ -> if !verbose_unknown_messages then diff --git a/src/networks/donkey/donkeyProtoClient.ml b/src/networks/donkey/donkeyProtoClient.ml index c7162014..099d6e4f 100644 --- a/src/networks/donkey/donkeyProtoClient.ml +++ b/src/networks/donkey/donkeyProtoClient.ml @@ -446,7 +446,7 @@ module QueryChunkMd4Reply = struct (* Request 80 *) let md4 = get_md4 s 1 in let nchunks = get_int16 s 17 in (* lprintf "nchunks : %d" nchunks; lprint_newline (); *) - let chunks = Array.create nchunks md4 in + let chunks = Array.make nchunks md4 in for i = 0 to nchunks - 1 do chunks.(i) <- get_md4 s (19 + i * 16) done; @@ -1035,7 +1035,7 @@ module EmuleRequestSourcesReply = struct if ncount = 0 then [||] else let slen = (len - 19) / ncount in (* lprintf "PER SOURCES LEN: %d\n" slen; *) - let sources = Array.create ncount dummy_source in + let sources = Array.make ncount dummy_source in let rec iter pos i = if i < ncount then let ss = diff --git a/src/networks/gnutella/gnutellaClients.ml b/src/networks/gnutella/gnutellaClients.ml index f409ae21..5b6db9b2 100644 --- a/src/networks/gnutella/gnutellaClients.ml +++ b/src/networks/gnutella/gnutellaClients.ml @@ -231,7 +231,7 @@ save it on disk in the next version. *) lprintf "[TTR] ttr loaded\n"; let ttr = Buffer.contents buf in let tiger_pos = CommonUploads.tiger_pos nblocks in - let array = Array.create nblocks TigerTree.null in + let array = Array.make nblocks TigerTree.null in for i = 0 to nblocks - 1 do array.(i) <- TigerTree.direct_of_string (String.sub ttr ((tiger_pos + i) * 24) 24) diff --git a/src/networks/gnutella/gnutellaProto.ml b/src/networks/gnutella/gnutellaProto.ml index e407a416..f405e935 100644 --- a/src/networks/gnutella/gnutellaProto.ml +++ b/src/networks/gnutella/gnutellaProto.ml @@ -815,8 +815,8 @@ let create_qrt_table words table_size = lprintf "create_qrt_table\n"; let infinity = 7 in let table_length = 1 lsl table_size in - let old_array = Array.create table_length infinity in - let array = Array.create table_length infinity in + let old_array = Array.make table_length infinity in + let array = Array.make table_length infinity in List.iter (fun w -> let pos = bloom_hash w table_size in if !verbose then diff --git a/src/networks/gnutella2/g2Proto.ml b/src/networks/gnutella2/g2Proto.ml index b223ae80..bc8834cf 100644 --- a/src/networks/gnutella2/g2Proto.ml +++ b/src/networks/gnutella2/g2Proto.ml @@ -1088,7 +1088,7 @@ let parse_udp_packet ip port buf = if nCount > 1 then begin let my_part = (get_uint8 buf 6)-1 in (* lprintf "part %d on %d\n" my_part nCount; *) - let needed = Array.create nCount None in + let needed = Array.make nCount None in Fifo.iter (fun (p_ip, p_port, nSeq, nPart, nFlags, data) -> if p_port = port && nSeq = nSequence && p_ip = ip then needed.(nPart) <- Some data @@ -1505,7 +1505,7 @@ let create_qrt_table2 words table_size = if !verbose then lprintf "table_length %d\n" table_length; - let array = Array.create table_length 0 in + let array = Array.make table_length 0 in List.iter (fun w -> let pos = bloom_hash w table_size in let pos = Int64.to_int pos in diff --git a/src/networks/soulseek/slskProtocol.ml b/src/networks/soulseek/slskProtocol.ml index 0b88ff5e..01c2a8ea 100644 --- a/src/networks/soulseek/slskProtocol.ml +++ b/src/networks/soulseek/slskProtocol.ml @@ -321,8 +321,8 @@ module S2C = struct (* let nrooms = get_int s 0 in - let room_names = Array.create nrooms "" in - let room_nusers = Array.create nrooms 0 in + let room_names = Array.make nrooms "" in + let room_nusers = Array.make nrooms 0 in let rec iter_names nleft pos = if nleft = 0 then pos else let name, pos = get_string s pos in diff --git a/src/utils/cdk/hashtbl2.ml b/src/utils/cdk/hashtbl2.ml index 8b856636..8dba9ae5 100644 --- a/src/utils/cdk/hashtbl2.ml +++ b/src/utils/cdk/hashtbl2.ml @@ -52,7 +52,7 @@ let resize hashfun tbl = let osize = Array.length odata in let nsize = min (2 * osize + 1) Sys.max_array_length in if nsize <> osize then begin - let ndata = Array.create nsize Empty in + let ndata = Array.make nsize Empty in let rec insert_bucket = function Empty -> () | Cons(key, data, rest) -> diff --git a/src/utils/cdk/string2.ml b/src/utils/cdk/string2.ml index c0487cc9..9f8b218a 100644 --- a/src/utils/cdk/string2.ml +++ b/src/utils/cdk/string2.ml @@ -285,7 +285,7 @@ let map f s = let len = String.length s in if len = 0 then [||] else let v = f s.[0] in - let array = Array.create len v in + let array = Array.make len v in for i = 1 to len -1 do array.(i) <- f s.[i] done; diff --git a/src/utils/lib/bitv.ml b/src/utils/lib/bitv.ml index c10e1def..8791a640 100644 --- a/src/utils/lib/bitv.ml +++ b/src/utils/lib/bitv.ml @@ -47,7 +47,7 @@ let max_length = Sys.max_array_length * bpi let bit_j = Array.init bpi (fun j -> 1 lsl j) let bit_not_j = Array.init bpi (fun j -> max_int - bit_j.(j)) -let low_mask = Array.create (succ bpi) 0 +let low_mask = Array.make (succ bpi) 0 let _ = for i = 1 to bpi do low_mask.(i) <- low_mask.(i-1) lor bit_j.(pred i) done @@ -64,10 +64,10 @@ let create n b = let initv = if b then max_int else 0 in let r = n mod bpi in if r = 0 then - { length = n; bits = Array.create (n / bpi) initv } + { length = n; bits = Array.make (n / bpi) initv } else begin let s = n / bpi in - let b = Array.create (succ s) initv in + let b = Array.make (succ s) initv in b.(s) <- b.(s) land low_mask.(r); { length = n; bits = b } end @@ -109,12 +109,12 @@ let unsafe_set v n b = (*s The corresponding safe operations test the validiy of the access. *) let get v n = - if n < 0 or n >= v.length then invalid_arg "Bitv.get"; + if n < 0 || n >= v.length then invalid_arg "Bitv.get"; let (i,j) = pos n in ((Array.unsafe_get v.bits i) land (Array.unsafe_get bit_j j)) > 0 let set v n b = - if n < 0 or n >= v.length then invalid_arg "Bitv.set"; + if n < 0 || n >= v.length then invalid_arg "Bitv.set"; let (i,j) = pos n in if b then Array.unsafe_set v.bits i @@ -200,8 +200,8 @@ let unsafe_blit v1 ofs1 v2 ofs2 len = end let blit v1 ofs1 v2 ofs2 len = - if len < 0 or ofs1 < 0 or ofs1 + len > v1.length - or ofs2 < 0 or ofs2 + len > v2.length + if len < 0 || ofs1 < 0 || ofs1 + len > v1.length + || ofs2 < 0 || ofs2 + len > v2.length then invalid_arg "Bitv.blit"; unsafe_blit v1.bits ofs1 v2.bits ofs2 len @@ -209,7 +209,7 @@ let blit v1 ofs1 v2 ofs2 len = new vector of length [len] and blitting the subvector of [v] inside. *) let sub v ofs len = - if ofs < 0 or len < 0 or ofs + len > v.length then invalid_arg "Bitv.sub"; + if ofs < 0 || len < 0 || ofs + len > v.length then invalid_arg "Bitv.sub"; let r = create len false in unsafe_blit v.bits ofs r.bits 0 len; r @@ -282,7 +282,7 @@ let blit_ones v ofs len = end let fill v ofs len b = - if ofs < 0 or len < 0 or ofs + len > v.length then invalid_arg "Bitv.fill"; + if ofs < 0 || len < 0 || ofs + len > v.length then invalid_arg "Bitv.fill"; if b then blit_ones v.bits ofs len else blit_zeros v.bits ofs len (*s All the iterators are implemented as for traditional arrays, using @@ -361,7 +361,7 @@ let bw_and v1 v2 = let b1 = v1.bits and b2 = v2.bits in let n = Array.length b1 in - let a = Array.create n 0 in + let a = Array.make n 0 in for i = 0 to n - 1 do a.(i) <- b1.(i) land b2.(i) done; @@ -373,7 +373,7 @@ let bw_or v1 v2 = let b1 = v1.bits and b2 = v2.bits in let n = Array.length b1 in - let a = Array.create n 0 in + let a = Array.make n 0 in for i = 0 to n - 1 do a.(i) <- b1.(i) lor b2.(i) done; @@ -385,7 +385,7 @@ let bw_xor v1 v2 = let b1 = v1.bits and b2 = v2.bits in let n = Array.length b1 in - let a = Array.create n 0 in + let a = Array.make n 0 in for i = 0 to n - 1 do a.(i) <- b1.(i) lxor b2.(i) done; @@ -394,7 +394,7 @@ let bw_xor v1 v2 = let bw_not v = let b = v.bits in let n = Array.length b in - let a = Array.create n 0 in + let a = Array.make n 0 in for i = 0 to n - 1 do a.(i) <- max_int land (lnot b.(i)) done; diff --git a/src/utils/lib/fifo.ml b/src/utils/lib/fifo.ml index 8186cb7e..8c75093e 100644 --- a/src/utils/lib/fifo.ml +++ b/src/utils/lib/fifo.ml @@ -75,7 +75,7 @@ let create () = { empty = true; inpos = 0; outpos = 0; - array = Array.create 4 (Obj.magic ()); + array = Array.make 4 (Obj.magic ()); size = 3; } @@ -114,7 +114,7 @@ let mem t v = let realloc t = let len = Array.length t.array in - let tab = Array.create (2*len) t.array.(0) in + let tab = Array.make (2*len) t.array.(0) in let start = len - t.inpos in Array.blit t.array t.inpos tab 0 start; Array.blit t.array 0 tab start (len - start); @@ -126,7 +126,7 @@ let realloc t = let shrink t = if t.size > 3 then begin let len = Array.length t.array in - let tab = Array.create (len/2) t.array.(0) in + let tab = Array.make (len/2) t.array.(0) in if t.outpos < t.inpos then begin Array.blit t.array t.outpos tab 0 (t.inpos - t.outpos); t.inpos <- t.inpos - t.outpos; @@ -154,7 +154,7 @@ lprintf "FIFO NOT EMPTY %s" (string_of_bool t.empty); lprint_newline (); let clear t = (* lprintf "FIFO CLEAR"; lprint_newline (); *) - let tab = Array.create 4 t.array.(0) in + let tab = Array.make 4 t.array.(0) in t.array <- tab; t.size <- 3; t.empty <- true; @@ -189,13 +189,13 @@ let to_list t = if t.empty then [] else if t.inpos > t.outpos then let len = t.inpos - t.outpos in - let tab = Array.create len t.array.(0) in + let tab = Array.make len t.array.(0) in Array.blit t.array t.outpos tab 0 len; Array.to_list tab else let s = Array.length t.array in let len = s + t.inpos - t.outpos in - let tab = Array.create len t.array.(0) in + let tab = Array.make len t.array.(0) in Array.blit t.array t.outpos tab 0 (s - t.outpos); Array.blit t.array 0 tab (s - t.outpos) t.inpos; Array.to_list tab @@ -204,13 +204,13 @@ let to_array t = if t.empty then [||] else if t.inpos > t.outpos then let len = t.inpos - t.outpos in - let tab = Array.create len t.array.(0) in + let tab = Array.make len t.array.(0) in Array.blit t.array t.outpos tab 0 len; tab else let s = Array.length t.array in let len = s + t.inpos - t.outpos in - let tab = Array.create len t.array.(0) in + let tab = Array.make len t.array.(0) in Array.blit t.array t.outpos tab 0 (s - t.outpos); Array.blit t.array 0 tab (s - t.outpos) t.inpos; tab @@ -231,7 +231,7 @@ let reformat t = if not t.empty then begin let s = Array.length t.array in let len = s + t.inpos - t.outpos in - let tab = Array.create s t.array.(0) in + let tab = Array.make s t.array.(0) in Array.blit t.array t.outpos tab 0 (s - t.outpos); Array.blit t.array 0 tab (s - t.outpos) t.inpos; t.array <- tab; diff --git a/src/utils/lib/gettext.ml4 b/src/utils/lib/gettext.ml4 index fcfe50db..e40ac69b 100644 --- a/src/utils/lib/gettext.ml4 +++ b/src/utils/lib/gettext.ml4 @@ -241,22 +241,22 @@ let register modname x = if !next_slot = Array.length !translation then begin (* lprintf "Incrementing size\n"; *) - let new_array = Array.create (2 * !next_slot+ 1) false + let new_array = Array.make (2 * !next_slot+ 1) false in Array.blit !verified 0 new_array 0 !next_slot; verified := new_array; - let new_array = Array.create (2 * !next_slot+ 1) no_translation + let new_array = Array.make (2 * !next_slot+ 1) no_translation in Array.blit !translation 0 new_array 0 !next_slot; translation := new_array; - let new_array = Array.create (2 * !next_slot+ 1) 0 + let new_array = Array.make (2 * !next_slot+ 1) 0 in Array.blit !requests 0 new_array 0 !next_slot; requests := new_array; - let new_array = Array.create (2 * !next_slot+ 1) no_translation + let new_array = Array.make (2 * !next_slot+ 1) no_translation in Array.blit !default 0 new_array 0 !next_slot; default := new_array; diff --git a/src/utils/lib/indexer.ml b/src/utils/lib/indexer.ml index 9b8df2a4..c80f4494 100644 --- a/src/utils/lib/indexer.ml +++ b/src/utils/lib/indexer.ml @@ -283,7 +283,7 @@ module QueryMake(Index: Index) = struct None -> [||] | Some doc -> let max_docs = min !count max_search_results in - let array = Array.create max_docs doc in + let array = Array.make max_docs doc in count := 0; (try Intmap.iter (fun num doc -> diff --git a/src/utils/lib/indexer2.ml b/src/utils/lib/indexer2.ml index e34b03a2..36e117a1 100644 --- a/src/utils/lib/indexer2.ml +++ b/src/utils/lib/indexer2.ml @@ -101,8 +101,8 @@ module Make(Doc : sig end; done; if pos = len then begin - let new_docs = Array.create (len + len/2 + 2) doc in - let new_fields = Array.create (len + len/2 + 2) 0 in + let new_docs = Array.make (len + len/2 + 2) doc in + let new_fields = Array.make (len + len/2 + 2) 0 in Array.blit node.docs 0 new_docs 0 len; Array.blit node.fields 0 new_fields 0 len; node.docs <- new_docs; @@ -124,7 +124,7 @@ module Make(Doc : sig let n = new_node () in let len = Array.length node.nodes in if len <= c then begin - let new_nodes = Array.create (c+1) None in + let new_nodes = Array.make (c+1) None in Array.blit node.nodes 0 new_nodes 0 len; node.nodes <- new_nodes; end; diff --git a/src/utils/lib/store.ml b/src/utils/lib/store.ml index b44f0adb..ffebeeb5 100644 --- a/src/utils/lib/store.ml +++ b/src/utils/lib/store.ml @@ -99,7 +99,7 @@ let file_store file str = if pos >= len_all_pos then begin let new_size = (len_all_pos + 10) * 2 in Unix2.c_ftruncate64 file.file_fd (Int64.of_int (new_size * file.file_entry_size)) false; - let new_tab = Array.create new_size 0 in + let new_tab = Array.make new_size 0 in let new_weak = Weak.create new_size in (try Array.blit file.file_all_pos 0 new_tab 0 pos with e -> @@ -175,7 +175,7 @@ let add t v = let len_all_doc = Array.length t.store_all_doc in if doc >= len_all_doc then begin let new_size = (len_all_doc + 10) * 2 in - let new_tab = Array.create new_size 0 in + let new_tab = Array.make new_size 0 in (try Array.blit t.store_all_doc 0 new_tab 0 doc with e -> lprintf_nl "Error in blit %d/%d" doc len_all_doc; raise e) diff --git a/src/utils/lib/unix32.ml b/src/utils/lib/unix32.ml index 27e856b7..8ec01c3f 100644 --- a/src/utils/lib/unix32.ml +++ b/src/utils/lib/unix32.ml @@ -1039,7 +1039,7 @@ module SparseFile = struct len = zero; fd = fd; } in - let new_array = Array.create (nchunks+1) chunk in + let new_array = Array.make (nchunks+1) chunk in Array.blit t.chunks 0 new_array 0 nchunks; t.chunks <- new_array @@ -1055,7 +1055,7 @@ module SparseFile = struct len = zero; fd = fd; } in - let new_array = Array.create (nchunks+1) chunk in + let new_array = Array.make (nchunks+1) chunk in Array.blit t.chunks 0 new_array 0 index; Array.blit t.chunks index new_array (index+1) (nchunks-index); t.chunks <- new_array; diff --git a/src/utils/net/base64.ml b/src/utils/net/base64.ml index 136a25c7..95585fb1 100644 --- a/src/utils/net/base64.ml +++ b/src/utils/net/base64.ml @@ -123,7 +123,7 @@ let encode_with_options b64 equal s pos len linelen crlf = (* If required, add another line end: *) - if linelen > 3 & !q > 0 then begin + if linelen > 3 && !q > 0 then begin if crlf then begin t.[ !j ] <- '\013'; t.[ !j+1 ] <- '\010'; @@ -170,7 +170,7 @@ let decode_substring t ~pos ~len ~url_variant:p_url ~accept_spaces:p_spaces = match String.unsafe_get t i with (' '|'\t'|'\r'|'\n') -> () | ('='|'.') as ch -> - if ch = '.' & not p_url then + if ch = '.' && not p_url then invalid_arg "Netencoding.Base64.decode_substring"; incr c; incr p; @@ -194,11 +194,11 @@ let decode_substring t ~pos ~len ~url_variant:p_url ~accept_spaces:p_spaces = ( if len mod 4 <> 0 then invalid_arg "Netencoding.Base64.decode_substring"; if len > 0 then ( - if String.sub t (len - 2) 2 = "==" or - (p_url & String.sub t (len - 2) 2 = "..") then 2 + if String.sub t (len - 2) 2 = "==" || + (p_url && String.sub t (len - 2) 2 = "..") then 2 else - if String.sub t (len - 1) 1 = "=" or - (p_url & String.sub t (len - 1) 1 = ".") then 1 + if String.sub t (len - 1) 1 = "=" || + (p_url && String.sub t (len - 1) 1 = ".") then 1 else 0 ) @@ -285,14 +285,14 @@ let decode_substring t ~pos ~len ~url_variant:p_url ~accept_spaces:p_spaces = let c2 = next_char() in let c3 = next_char() in - if (c2 = '=' & c3 = '=') or (p_url & c2 = '.' & c3 = '.') then begin + if (c2 = '=' && c3 = '=') or (p_url && c2 = '.' && c3 = '.') then begin let n0 = decode_char c0 in let n1 = decode_char c1 in let x0 = (n0 lsl 2) lor (n1 lsr 4) in s.[ q ] <- Char.chr x0; end else - if (c3 = '=') or (p_url & c3 = '.') then begin + if (c3 = '=') or (p_url && c3 = '.') then begin let n0 = decode_char c0 in let n1 = decode_char c1 in let n2 = decode_char c2 in diff --git a/src/utils/net/ip_set.ml b/src/utils/net/ip_set.ml index c59d925a..600b91d1 100644 --- a/src/utils/net/ip_set.ml +++ b/src/utils/net/ip_set.ml @@ -198,7 +198,7 @@ let match_ip_aux bl ip = let rec short_march_aux a ip_hi ip_lo n = if n < Array2.length a then let br = Array2.get a n in - if (compare_split ip_hi ip_lo br.short_begin_high (begin_low_bits br.short_low_hits) >= 0) & + if (compare_split ip_hi ip_lo br.short_begin_high (begin_low_bits br.short_low_hits) >= 0) && (compare_split ip_hi ip_lo br.sort_end_high (end_low_bits br.short_low_hits) <= 0) then begin br.short_low_hits <- succ_hits br.short_low_hits; n diff --git a/src/utils/net/tcpBufferedSocket.ml b/src/utils/net/tcpBufferedSocket.ml index 4fd8f41b..ba55478d 100644 --- a/src/utils/net/tcpBufferedSocket.ml +++ b/src/utils/net/tcpBufferedSocket.ml @@ -352,7 +352,7 @@ let min_buffer_read = 2000 let min_read_size = min_buffer_read - 100 let old_strings_size = 20 -let old_strings = Array.create old_strings_size "" +let old_strings = Array.make old_strings_size "" let old_strings_len = ref 0 let new_string () = @@ -885,7 +885,7 @@ let create_read_bandwidth_controler name rate = allow_io = ref true; remaining_bytes_user = (fun _ _ -> ()); moved_bytes = Int64.zero; - lost_bytes = Array.create 3600 0; + lost_bytes = Array.make 3600 0; forecast_bytes = 0; ndone_last_second = 0; } in @@ -902,7 +902,7 @@ let create_write_bandwidth_controler name rate = allow_io = ref true; remaining_bytes_user = (fun _ _ -> ()); moved_bytes = Int64.zero; - lost_bytes = Array.create 3600 0; + lost_bytes = Array.make 3600 0; forecast_bytes = 0; ndone_last_second = 0; } in diff --git a/tools/observer.ml b/tools/observer.ml index c6f2be40..33566377 100644 --- a/tools/observer.ml +++ b/tools/observer.ml @@ -362,8 +362,8 @@ let print_record t ip_firewall s = | "DKNB" -> let len = get_int s 0 in - let ngood_propositions = Array.create len zero in - let nbad_propositions = Array.create len zero in + let ngood_propositions = Array.make len zero in + let nbad_propositions = Array.make len zero in let pos = 4 in for i = 0 to len - 1 do ngood_propositions.(i) <- get_int64 s (pos+i*16); diff --git a/tools/xpm.mll b/tools/xpm.mll index 3e4a53bc..db117f80 100644 --- a/tools/xpm.mll +++ b/tools/xpm.mll @@ -201,7 +201,7 @@ let readPixmapDataFromFile filename = try let lexbuf = Lexing.from_channel ic in let (dx,dy,ncolors,nchars) = first_line lexbuf in - let colors = Array.create ncolors NoColor in + let colors = Array.make ncolors NoColor in let codes = Hashtbl.create ncolors in for i = 0 to ncolors - 1 do code := String.create nchars; @@ -209,7 +209,7 @@ let readPixmapDataFromFile filename = colors.(i) <- color_def lexbuf; Hashtbl.add codes !code i; done; - let table = Array.init dy (fun _ -> Array.create dx 0) in + let table = Array.init dy (fun _ -> Array.make dx 0) in let code = String.create nchars in for y = 0 to dy - 1 do let line = xpm_line lexbuf in -- 2.11.4.GIT