aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2009-10-24 14:01:03 +0000
committerAndreas Schwab2009-10-24 14:01:03 +0000
commit10d66ec001d9292656cdebcc1e944eac403712dc (patch)
tree1863e6cc7f747479c2ace05c89a43034b4eb51c4 /src
parenta9a2a6db29a6aef761527d9b5ce776410575669e (diff)
downloademacs-10d66ec001d9292656cdebcc1e944eac403712dc.tar.gz
emacs-10d66ec001d9292656cdebcc1e944eac403712dc.zip
(procfs_ttyname): Fix sprintf format to match argument
type. (system_process_attributes): Likewise.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/sysdep.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8500509cd5b..ff6e0551d9e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12009-10-24 Andreas Schwab <schwab@linux-m68k.org>
2
3 * sysdep.c (procfs_ttyname): Fix sprintf format to match argument
4 type.
5 (system_process_attributes): Likewise.
6
12009-10-24 Dan Nicolaescu <dann@ics.uci.edu> 72009-10-24 Dan Nicolaescu <dann@ics.uci.edu>
2 8
3 * keymap.c (Fmake_sparse_keymap): Purecopy the name. 9 * keymap.c (Fmake_sparse_keymap): Purecopy the name.
diff --git a/src/sysdep.c b/src/sysdep.c
index 210ad37fee9..fc252e87aa8 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -3303,7 +3303,7 @@ procfs_ttyname (int rdev)
3303 3303
3304 if (MINOR (rdev) >= minor_beg && MINOR (rdev) <= minor_end) 3304 if (MINOR (rdev) >= minor_beg && MINOR (rdev) <= minor_end)
3305 { 3305 {
3306 sprintf (name + strlen (name), "%lu", MINOR (rdev)); 3306 sprintf (name + strlen (name), "%u", MINOR (rdev));
3307 break; 3307 break;
3308 } 3308 }
3309 } 3309 }
@@ -3374,7 +3374,7 @@ system_process_attributes (Lisp_Object pid)
3374 3374
3375 CHECK_NUMBER_OR_FLOAT (pid); 3375 CHECK_NUMBER_OR_FLOAT (pid);
3376 proc_id = FLOATP (pid) ? XFLOAT_DATA (pid) : XINT (pid); 3376 proc_id = FLOATP (pid) ? XFLOAT_DATA (pid) : XINT (pid);
3377 sprintf (procfn, "/proc/%lu", proc_id); 3377 sprintf (procfn, "/proc/%u", proc_id);
3378 if (stat (procfn, &st) < 0) 3378 if (stat (procfn, &st) < 0)
3379 return attrs; 3379 return attrs;
3380 3380