Julien Puydt pushed to branch upstream at Debian OCaml Maintainers / obus
Commits:
1700c815 by Julien Puydt at 2022-08-15T22:37:17+02:00
New upstream version 1.2.4
- - - - -
3 changed files:
- src/protocol/oBus_address.ml
- tools/tools_util/utils.ml
- tools/transformers/obus_gen_client.ml
Changes:
=====================================
src/protocol/oBus_address.ml
=====================================
@@ -108,10 +108,8 @@ let xdg_fallback_session () =
Lwt.catch (fun () ->
let sock_path = Filename.concat path "bus" in
let%lwt stat = Lwt_unix.stat sock_path in
- let%lwt login = Lwt_unix.getlogin () in
- let%lwt user = Lwt_unix.getpwnam login in
- if stat.st_uid = user.pw_uid
- && stat.st_kind = Lwt_unix.S_SOCK
+ let uid = Unix.getuid () in
+ if stat.st_uid = uid && stat.st_kind = Lwt_unix.S_SOCK
then Lwt.return_some [{ name = "unix"; args = [("path", sock_path)] }]
else Lwt.return_none)
(fun _ -> Lwt.return_none)
=====================================
tools/tools_util/utils.ml
=====================================
@@ -130,7 +130,7 @@ let convertor_recv top typ =
(fun top t ->
match t with
| "int32" | "uint32" -> Some "Int32.to_int"
- | "object_path" -> Some(paren top ("OBus_proxy.make (OBus_context.sender context)"))
+ | "object_path" -> Some(paren top ("(fun x -> OBus_proxy.make ~peer:(OBus_context.sender context) ~path:x)"))
| name when List.mem name dbus_symbols -> None
| name -> Some("make_" ^ name))
top typ
=====================================
tools/transformers/obus_gen_client.ml
=====================================
@@ -141,7 +141,7 @@ let print_impl oc name members symbols annotations =
output_string oc " ";
print_names oc names;
output_string oc ")\n";
- fprintf oc " (OBus_signal.connect s_%s proxy)\n" name
+ fprintf oc " (OBus_signal.make s_%s proxy)\n" name
end
| Property(name, typ, access, annotations) ->
fprintf oc "\n let %s proxy =\n" (OBus_name.ocaml_lid name);
View it on GitLab:
https://salsa.debian.org/ocaml-team/obus/-/commit/1700c8156807a1003e36113669dfe659c2e47c16
--
View it on GitLab:
https://salsa.debian.org/ocaml-team/obus/-/commit/1700c8156807a1003e36113669dfe659c2e47c16
You're receiving this email because of your account on salsa.debian.org.
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "
http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style data-premailer="ignore" type="text/css">
a { color: #1068bf; }
</style>
<style>img {
max-width: 100%; height: auto;
}
body {
font-size: 0.875rem;
}
body {
-webkit-text-shadow: rgba(255,255,255,0.01) 0 0 1px;
}
body {
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Noto Sans", Ubuntu, Cantarell, "Helvetica Neue", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; font-size: inherit;
}
</style>
</head>
<body style='font-size: inherit; -webkit-text-shadow: rgba(255,255,255,0.01) 0 0 1px; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Noto Sans", Ubuntu, Cantarell, "Helvetica Neue", sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
"Segoe UI Symbol", "Noto Color Emoji";'>
<div class="content">
<h3 style="margin-top: 20px; margin-bottom: 10px;">
Julien Puydt pushed to branch upstream at <a href="
https://salsa.debian.org/ocaml-team/obus" style="color: #1068bf;">Debian OCaml Maintainers / obus</a>
</h3>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
Commits:
</h4>
<strong style="font-weight: bold;"><a href="
https://salsa.debian.org/ocaml-team/obus/-/commit/1700c8156807a1003e36113669dfe659c2e47c16" style="color: #1068bf;">1700c815</a></strong>
<div>
<span> by Julien Puydt </span> <i> at 2022-08-15T22:37:17+02:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "
lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: #fafafa; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dbdbdb;'>New upstream version 1.2.4</pre>
</li>
</ul>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
3 changed files:
</h4>
<li class="file-stats">
<a href="#e2911773524759d5df1c6673b3d9ff58f56046c0" style="color: #1068bf;"> src/protocol/oBus_address.ml
</li>
<li class="file-stats">
<a href="#8847989f5b33336b9687a42c5a7005cc31ea304b" style="color: #1068bf;"> tools/tools_util/utils.ml
</li>
<li class="file-stats">
<a href="#75c64569a563426659480933a16e8ac49c6a654c" style="color: #1068bf;"> tools/transformers/obus_gen_client.ml
</li>
</ul>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
Changes:
</h4>
<li id="e2911773524759d5df1c6673b3d9ff58f56046c0">
<a href="
https://salsa.debian.org/ocaml-team/obus/-/commit/1700c8156807a1003e36113669dfe659c2e47c16#e2911773524759d5df1c6673b3d9ff58f56046c0" style="color: #1068bf;"><strong style="font-weight: bold;">src/protocol/oBus_address.ml</strong></a>
<hr style="overflow: hidden; border: 1px solid #e1e1e1;">
<table class="code white" style="border-spacing: 0; border-collapse: collapse; width: auto; font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="108" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">...</
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="108" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">...</
<td class="line_content match" style="color: rgba(0,0,0,0.3); padding: inherit;" bgcolor="#fafafa">@@ -108,10 +108,8 @@ let xdg_fallback_session () =</td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="108" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">
108
</td>
<td class="new_line diff-line-num" data-linenumber="108" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">
108
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono",
"lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'> <span id="LC108" class="line" lang="ocaml"> <span class="nn" style="
color: #555;">Lwt</span><span class="p">.</span><span class="n" style="color: #333;">catch</span> <span class="p">(</span><span class="k" style="font-weight: 600;">fun</span> <span class="bp" style="color: #999;">()</span> <span class="o" style="font-
weight: 600;">-></span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="109" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">
109
</td>
<td class="new_line diff-line-num" data-linenumber="109" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">
109
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono",
"lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'> <span id="LC109" class="line" lang="ocaml"> <span class="k" style="
font-weight: 600;">let</span> <span class="n" style="color: #333;">sock_path</span> <span class="o" style="font-weight: 600;">=</span> <span class="nn" style="color: #555;">Filename</span><span class="p">.</span><span class="n" style="color: #333;">
concat</span> <span class="n" style="color: #333;">path</span> <span class="s2" style="color: #d14;">"bus"</span> <span class="k" style="font-weight: 600;">in</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="110" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">
110
</td>
<td class="new_line diff-line-num" data-linenumber="110" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">
110
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono",
"lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'> <span id="LC110" class="line" lang="ocaml"> <span class="k" style="
font-weight: 600;">let</span><span class="o" style="font-weight: 600;">%</span><span class="n" style="color: #333;">lwt</span> <span class="n" style="color: #333;">stat</span> <span class="o" style="font-weight: 600;">=</span> <span class="nn" style="
color: #555;">Lwt_unix</span><span class="p">.</span><span class="n" style="color: #333;">stat</span> <span class="n" style="color: #333;">sock_path</span> <span class="k" style="font-weight: 600;">in</span></span>
</pre></td>
</tr>
<tr class="line_holder old" style="line-height: 1.6;">
<td class="old_line diff-line-num old" data-linenumber="111" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">
111
</td>
<td class="new_line diff-line-num old" data-linenumber="111" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding: inherit;" bgcolor="#fbe9eb"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "
Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'>-<span id="LC111" class="line" lang="ocaml">
<span class="k" style="font-weight: 600;">let</span><span class="o" style="font-weight: 600;">%</span><span class="n" style="color: #333;">lwt</span> <span class="n" style="color: #333;">login</span> <span class="o" style="font-weight: 600;">=</span>
<span class="nn" style="color: #555;">Lwt_unix</span><span class="p">.</span><span class="n" style="color: #333;">getlogin</span> <span class="bp" style="color: #999;">()</span> <span class="k" style="font-weight: 600;">in</span></span>
</pre></td>
</tr>
<tr class="line_holder old" style="line-height: 1.6;">
<td class="old_line diff-line-num old" data-linenumber="112" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">
112
</td>
<td class="new_line diff-line-num old" data-linenumber="111" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding: inherit;" bgcolor="#fbe9eb"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "
Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'>-<span id="LC112" class="line" lang="ocaml">
<span class="k" style="font-weight: 600;">let</span><span class="o" style="font-weight: 600;">%</span><span class="n" style="color: #333;">lwt</span> <span class="n" style="color: #333;">user</span> <span class="o" style="font-weight: 600;">=</span> <
span class="nn" style="color: #555;">Lwt_unix</span><span class="p">.</span><span class="n" style="color: #333;">getpwnam</span> <span class="n" style="color: #333;">login</span> <span class="k" style="font-weight: 600;">in</span></span>
</pre></td>
</tr>
<tr class="line_holder old" style="line-height: 1.6;">
<td class="old_line diff-line-num old" data-linenumber="113" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">
113
</td>
<td class="new_line diff-line-num old" data-linenumber="111" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding: inherit;" bgcolor="#fbe9eb"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "
Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'>-<span id="LC113" class="line" lang="ocaml">
<span class="k" style="font-weight: 600;">if</span> <span class="n" style="color: #333;">stat</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">st_uid</span> <span class="o" style="font-weight: 600;">=</span>
<span class="n" style="color: #333;">user</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">pw_uid</span></span>
</pre></td>
</tr>
<tr class="line_holder old" style="line-height: 1.6;">
<td class="old_line diff-line-num old" data-linenumber="114" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">
114
</td>
<td class="new_line diff-line-num old" data-linenumber="111" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding: inherit;" bgcolor="#fbe9eb"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "
Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'>-<span id="LC114" class="line" lang="ocaml">
<span class="o" style="font-weight: 600;">&&</span> <span class="n" style="color: #333;">stat</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">st_kind</span> <span class="o" style="font-weight:
600;">=</span> <span class="nn" style="color: #555;">Lwt_unix</span><span class="p">.</span><span class="nc" style="color: #458; font-weight: 600;">S_SOCK</span></span>
</pre></td>
</tr>
<tr class="line_holder new" style="line-height: 1.6;">
<td class="old_line diff-line-num new" data-linenumber="115" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">
</td>
<td class="new_line diff-line-num new" data-linenumber="111" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">
111
</td>
<td class="line_content new" style="padding: inherit;" bgcolor="#ecfdf0"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "
Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'>+<span id="LC111" class="line" lang="ocaml">
<span class="k" style="font-weight: 600;">let</span> <span class="n" style="color: #333;">uid</span> <span class="o" style="font-weight: 600;">=</span> <span class="nn" style="color: #555;">Unix</span><span class="p">.</span><span class="n" style="
color: #333;">getuid</span> <span class="bp" style="color: #999;">()</span> <span class="k" style="font-weight: 600;">in</span></span>
</pre></td>
</tr>
<tr class="line_holder new" style="line-height: 1.6;">
<td class="old_line diff-line-num new" data-linenumber="115" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">
</td>
<td class="new_line diff-line-num new" data-linenumber="112" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">
112
</td>
<td class="line_content new" style="padding: inherit;" bgcolor="#ecfdf0"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "
Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'>+<span id="LC112" class="line" lang="ocaml">
<span class="k" style="font-weight: 600;">if</span> <span class="n" style="color: #333;">stat</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">st_uid</span> <span class="o" style="font-weight: 600;">=</span>
<span class="n" style="color: #333;">uid</span> <span class="o" style="font-weight: 600;">&&</span> <span class="n" style="color: #333;">stat</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">st_kind</
span> <span class="o" style="font-weight: 600;">=</span> <span class="nn" style="color: #555;">Lwt_unix</span><span class="p">.</span><span class="nc" style="color: #458; font-weight: 600;">S_SOCK</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="115" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">
115
</td>
<td class="new_line diff-line-num" data-linenumber="113" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">
113
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono",
"lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'> <span id="LC113" class="line" lang="ocaml"> <span class="k" style="
font-weight: 600;">then</span> <span class="nn" style="color: #555;">Lwt</span><span class="p">.</span><span class="n" style="color: #333;">return_some</span> <span class="p">[{</span> <span class="n" style="color: #333;">name</span> <span class="o"
style="font-weight: 600;">=</span> <span class="s2" style="color: #d14;">"unix"</span><span class="p">;</span> <span class="n" style="color: #333;">args</span> <span class="o" style="font-weight: 600;">=</span> <span class="p">[(</span><span class="s2"
style="color: #d14;">"path"</span><span class="o" style="font-weight: 600;">,</span> <span class="n" style="color: #333;">sock_path</span><span class="p">)]</span> <span class="p">}]</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="116" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">
116
</td>
<td class="new_line diff-line-num" data-linenumber="114" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">
114
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono",
"lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'> <span id="LC114" class="line" lang="ocaml"> <span class="k" style="
font-weight: 600;">else</span> <span class="nn" style="color: #555;">Lwt</span><span class="p">.</span><span class="n" style="color: #333;">return_none</span><span class="p">)</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="117" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">
117
</td>
<td class="new_line diff-line-num" data-linenumber="115" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">
115
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono",
"lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'> <span id="LC115" class="line" lang="ocaml"> <span class="p">(</span><
span class="k" style="font-weight: 600;">fun</span> <span class="n" style="color: #333;">_</span> <span class="o" style="font-weight: 600;">-></span> <span class="nn" style="color: #555;">Lwt</span><span class="p">.</span><span class="n" style="color:
#333;">return_none</span><span class="p">)</span></span>
</pre></td>
</tr>
</table>
</li>
<li id="8847989f5b33336b9687a42c5a7005cc31ea304b">
<a href="
https://salsa.debian.org/ocaml-team/obus/-/commit/1700c8156807a1003e36113669dfe659c2e47c16#8847989f5b33336b9687a42c5a7005cc31ea304b" style="color: #1068bf;"><strong style="font-weight: bold;">tools/tools_util/utils.ml</strong></a>
<hr style="overflow: hidden; border: 1px solid #e1e1e1;">
<table class="code white" style="border-spacing: 0; border-collapse: collapse; width: auto; font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="130" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">...</
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="130" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">...</
<td class="line_content match" style="color: rgba(0,0,0,0.3); padding: inherit;" bgcolor="#fafafa">@@ -130,7 +130,7 @@ let convertor_recv top typ =</td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="130" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">
130
</td>
<td class="new_line diff-line-num" data-linenumber="130" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">
130
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono",
"lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'> <span id="LC130" class="line" lang="ocaml"> <span class="p">(</span><span
class="k" style="font-weight: 600;">fun</span> <span class="n" style="color: #333;">top</span> <span class="n" style="color: #333;">t</span> <span class="o" style="font-weight: 600;">-></span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="131" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">
131
</td>
<td class="new_line diff-line-num" data-linenumber="131" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">
131
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono",
"lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'> <span id="LC131" class="line" lang="ocaml"> <span class="k" style="
font-weight: 600;">match</span> <span class="n" style="color: #333;">t</span> <span class="k" style="font-weight: 600;">with</span></span>
</pre></td>
</tr>
<tr class="line_holder" style="line-height: 1.6;">
<td class="old_line diff-line-num" data-linenumber="132" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">
132
</td>
<td class="new_line diff-line-num" data-linenumber="132" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: inherit;" align="right" bgcolor="#fafafa">
132
</td>
<td class="line_content" style="padding: inherit;"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono",
"lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'> <span id="LC132" class="line" lang="ocaml"> <span class="o" style="
font-weight: 600;">|</span> <span class="s2" style="color: #d14;">"int32"</span> <span class="o" style="font-weight: 600;">|</span> <span class="s2" style="color: #d14;">"uint32"</span> <span class="o" style="font-weight: 600;">-></span> <span class="
nc" style="color: #458; font-weight: 600;">Some</span> <span class="s2" style="color: #d14;">"Int32.to_int"</span></span>
</pre></td>
</tr>
<tr class="line_holder old" style="line-height: 1.6;">
<td class="old_line diff-line-num old" data-linenumber="133" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">
133
</td>
<td class="new_line diff-line-num old" data-linenumber="133" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: inherit;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding: inherit;" bgcolor="#fbe9eb"><pre style='display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "
Courier New", "andale mono", "lucida console", monospace; word-break: break-all; word-wrap: break-word; background-color: inherit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #dbdbdb;'>-<span id="LC133" class="line" lang="ocaml">
<span class="o" style="font-weight: 600;">|</span> <span class="s2" style="color: #d14;">"object_path"</span> <span class="o" style="font-weight: 600;">-></span> <span class="nc" style="color: #458; font-weight: 600;">Some</span><span class="p">(</
span><span class="n" style="color: #333;">paren</span> <span class="n" style="color: #333;">top</span> <span class="p">(</span><span class="s2" style="color: #d14;">"OBus_proxy.make (OBus_context.sender context)"</span><span class="p">))</span></span>
</pre></td>
</tr>
<tr class="line_holder new" style="line-height: 1.6;">
<td class="old_line diff-line-num new" data-linenumber="134" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">
</td>
<td class="new_line diff-line-num new" data-linenumber="133" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: inherit;" align="right" bgcolor="#ddfbe6">
133
</td>
[continued in next message]
--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)