diff options
| author | Paul Eggert | 2011-01-30 14:22:58 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-30 14:22:58 -0800 |
| commit | 4eec7f8b2b465c6fc2c09d37d4da2b540f607df0 (patch) | |
| tree | 9f4e30300e4f96dd3c72f5f435032f8180ce1a6c /src/filelock.c | |
| parent | fcabb1a6e66f7e6cf4fe0984c4d5c169f4decd8a (diff) | |
| parent | 42a5b22fc0201fe98ad8a093c3ab91122ab3a72b (diff) | |
| download | emacs-4eec7f8b2b465c6fc2c09d37d4da2b540f607df0.tar.gz emacs-4eec7f8b2b465c6fc2c09d37d4da2b540f607df0.zip | |
Use SSDATA when the context wants char *.
Diffstat (limited to 'src/filelock.c')
| -rw-r--r-- | src/filelock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/filelock.c b/src/filelock.c index c23a9fef765..8fa871f56ef 100644 --- a/src/filelock.c +++ b/src/filelock.c | |||
| @@ -214,9 +214,9 @@ get_boot_time (void) | |||
| 214 | 214 | ||
| 215 | if (! NILP (filename)) | 215 | if (! NILP (filename)) |
| 216 | { | 216 | { |
| 217 | get_boot_time_1 (SDATA (filename), 1); | 217 | get_boot_time_1 (SSDATA (filename), 1); |
| 218 | if (delete_flag) | 218 | if (delete_flag) |
| 219 | unlink (SDATA (filename)); | 219 | unlink (SSDATA (filename)); |
| 220 | } | 220 | } |
| 221 | } | 221 | } |
| 222 | 222 | ||
| @@ -315,7 +315,7 @@ fill_in_lock_file_name (register char *lockfile, register Lisp_Object fn) | |||
| 315 | struct stat st; | 315 | struct stat st; |
| 316 | int count = 0; | 316 | int count = 0; |
| 317 | 317 | ||
| 318 | strcpy (lockfile, SDATA (fn)); | 318 | strcpy (lockfile, SSDATA (fn)); |
| 319 | 319 | ||
| 320 | /* Shift the nondirectory part of the file name (including the null) | 320 | /* Shift the nondirectory part of the file name (including the null) |
| 321 | right two characters. Here is one of the places where we'd have to | 321 | right two characters. Here is one of the places where we'd have to |
| @@ -475,7 +475,7 @@ current_lock_owner (lock_info_type *owner, char *lfname) | |||
| 475 | 475 | ||
| 476 | /* On current host? */ | 476 | /* On current host? */ |
| 477 | if (STRINGP (Fsystem_name ()) | 477 | if (STRINGP (Fsystem_name ()) |
| 478 | && strcmp (owner->host, SDATA (Fsystem_name ())) == 0) | 478 | && strcmp (owner->host, SSDATA (Fsystem_name ())) == 0) |
| 479 | { | 479 | { |
| 480 | if (owner->pid == getpid ()) | 480 | if (owner->pid == getpid ()) |
| 481 | ret = 2; /* We own it. */ | 481 | ret = 2; /* We own it. */ |