diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-30 14:22:58 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-30 14:22:58 -0800 |
| commit | 4eec7f8b2b465c6fc2c09d37d4da2b540f607df0 (patch) | |
| tree | 9f4e30300e4f96dd3c72f5f435032f8180ce1a6c /src/editfns.c | |
| parent | fcabb1a6e66f7e6cf4fe0984c4d5c169f4decd8a (diff) | |
| parent | 42a5b22fc0201fe98ad8a093c3ab91122ab3a72b (diff) | |
| download | emacs-4eec7f8b2b465c6fc2c09d37d4da2b540f607df0.tar.gz emacs-4eec7f8b2b465c6fc2c09d37d4da2b540f607df0.tar.bz2 emacs-4eec7f8b2b465c6fc2c09d37d4da2b540f607df0.zip | |
Use SSDATA when the context wants char *.
Diffstat (limited to 'src/editfns.c')
| -rw-r--r-- | src/editfns.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/editfns.c b/src/editfns.c index 5407cd772a7..a5f39870000 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -1345,7 +1345,7 @@ name, or nil if there is no such user. */) else if (STRINGP (uid)) { BLOCK_INPUT; - pw = (struct passwd *) getpwnam (SDATA (uid)); + pw = (struct passwd *) getpwnam (SSDATA (uid)); UNBLOCK_INPUT; } else @@ -1372,7 +1372,7 @@ name, or nil if there is no such user. */) r = (unsigned char *) alloca (strlen (p) + SCHARS (login) + 1); memcpy (r, p, q - p); r[q - p] = 0; - strcat (r, SDATA (login)); + strcat (r, SSDATA (login)); r[q - p] = UPCASE (r[q - p]); strcat (r, q + 1); full = build_string (r); @@ -1680,7 +1680,7 @@ For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z". */) buf[0] = '\1'; BLOCK_INPUT; - result = emacs_memftimeu (buf, size, SDATA (format_string), + result = emacs_memftimeu (buf, size, SSDATA (format_string), SBYTES (format_string), tm, ut); UNBLOCK_INPUT; @@ -1691,7 +1691,7 @@ For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z". */) /* If buffer was too small, make it bigger and try again. */ BLOCK_INPUT; result = emacs_memftimeu (NULL, (size_t) -1, - SDATA (format_string), + SSDATA (format_string), SBYTES (format_string), tm, ut); UNBLOCK_INPUT; |