Changeset 23388

Timestamp:

09/14/07 13:25:43 (15 months ago)

Author:

zarzycki@…

Message:

We need to finish building launchd with -Wshorten-64-to-32 someday...

Location:

trunk/launchd/src

Files:

• launchctl.c (modified) (1 diff)
• launchd_core_logic.c (modified) (2 diffs)
• launchproxy.c (modified) (1 diff)

trunk/launchd/src/launchctl.c

@@ -3055 +3055 @@
 
                 if (fstat(fd, &sb) != -1) { 
-                        if ((junkbuf = malloc(sb.st_size)) != NULL) {
-                                assumes(read(fd, junkbuf, sb.st_size) == sb.st_size);
+                        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);
                                 free(junkbuf);
                         }

trunk/launchd/src/launchd_core_logic.c

@@ -2344 +2344 @@
 
         if (j->start_time && (td < j->min_run_time) && !j->legacy_mach_job && !j->inetcompat) {
-                time_t respawn_delta = j->min_run_time - td;
+                time_t respawn_delta = j->min_run_time - (uint32_t)td;
 
                 /*
@@ -5899 +5899 @@
                 job_assumes(j, obj_at_idx = launch_data_array_get_index(out_obj_array, l2l_i));
                 job_assumes(j, tmp = launch_data_dict_lookup(obj_at_idx, TAKE_SUBSET_PID));
-                target_pid = launch_data_get_integer(tmp);
+                target_pid = (pid_t)launch_data_get_integer(tmp);
                 job_assumes(j, tmp = launch_data_dict_lookup(obj_at_idx, TAKE_SUBSET_PERPID));
                 serv_perpid = launch_data_get_bool(tmp);

trunk/launchd/src/launchproxy.c

@@ -109 +109 @@
         tmp = launch_data_dict_lookup(resp, LAUNCH_JOBKEY_TIMEOUT);
         if (tmp)
-                timeout.tv_sec = launch_data_get_integer(tmp);
+                timeout.tv_sec = (int)launch_data_get_integer(tmp);
 
         tmp = launch_data_dict_lookup(resp, LAUNCH_JOBKEY_PROGRAM);