<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[23388] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23388">23388</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-09-14 13:25:43 -0700 (Fri, 14 Sep 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>We need to finish building launchd with -Wshorten-64-to-32 someday...</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchctlc">trunk/launchd/src/launchctl.c</a></li>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
<li><a href="#trunklaunchdsrclaunchproxyc">trunk/launchd/src/launchproxy.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchctlc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchctl.c (23387 => 23388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchctl.c 2007-09-14 18:45:29 UTC (rev 23387)
+++ trunk/launchd/src/launchctl.c 2007-09-14 20:25:43 UTC (rev 23388)
</span><span class="lines">@@ -3054,8 +3054,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (fstat(fd, &sb) != -1) {
</span><del>- if ((junkbuf = malloc(sb.st_size)) != NULL) {
- assumes(read(fd, junkbuf, sb.st_size) == sb.st_size);
</del><ins>+ if ((sb.st_size < 10*1024*1024) && (junkbuf = malloc((size_t)sb.st_size)) != NULL) {
+ assumes(read(fd, junkbuf, (size_t)sb.st_size) == (ssize_t)sb.st_size);
</ins><span class="cx"> free(junkbuf);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23387 => 23388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-09-14 18:45:29 UTC (rev 23387)
+++ trunk/launchd/src/launchd_core_logic.c 2007-09-14 20:25:43 UTC (rev 23388)
</span><span class="lines">@@ -2343,7 +2343,7 @@
</span><span class="cx"> td /= NSEC_PER_SEC;
</span><span class="cx">
</span><span class="cx"> if (j->start_time && (td < j->min_run_time) && !j->legacy_mach_job && !j->inetcompat) {
</span><del>- time_t respawn_delta = j->min_run_time - td;
</del><ins>+ time_t respawn_delta = j->min_run_time - (uint32_t)td;
</ins><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * We technically should ref-count throttled jobs to prevent idle exit,
</span><span class="lines">@@ -5898,7 +5898,7 @@
</span><span class="cx">
</span><span class="cx"> job_assumes(j, obj_at_idx = launch_data_array_get_index(out_obj_array, l2l_i));
</span><span class="cx"> job_assumes(j, tmp = launch_data_dict_lookup(obj_at_idx, TAKE_SUBSET_PID));
</span><del>- target_pid = launch_data_get_integer(tmp);
</del><ins>+ target_pid = (pid_t)launch_data_get_integer(tmp);
</ins><span class="cx"> job_assumes(j, tmp = launch_data_dict_lookup(obj_at_idx, TAKE_SUBSET_PERPID));
</span><span class="cx"> serv_perpid = launch_data_get_bool(tmp);
</span><span class="cx"> job_assumes(j, tmp = launch_data_dict_lookup(obj_at_idx, TAKE_SUBSET_NAME));
</span></span></pre></div>
<a id="trunklaunchdsrclaunchproxyc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchproxy.c (23387 => 23388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchproxy.c 2007-09-14 18:45:29 UTC (rev 23387)
+++ trunk/launchd/src/launchproxy.c 2007-09-14 20:25:43 UTC (rev 23388)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">
</span><span class="cx"> tmp = launch_data_dict_lookup(resp, LAUNCH_JOBKEY_TIMEOUT);
</span><span class="cx"> if (tmp)
</span><del>- timeout.tv_sec = launch_data_get_integer(tmp);
</del><ins>+ timeout.tv_sec = (int)launch_data_get_integer(tmp);
</ins><span class="cx">
</span><span class="cx"> tmp = launch_data_dict_lookup(resp, LAUNCH_JOBKEY_PROGRAM);
</span><span class="cx"> if (tmp)
</span></span></pre>
</div>
</div>
</body>
</html>