aboutsummaryrefslogtreecommitdiffstats
path: root/src/editfns.c
diff options
context:
space:
mode:
authorPaul Eggert2011-01-30 14:17:44 -0800
committerPaul Eggert2011-01-30 14:17:44 -0800
commit42a5b22fc0201fe98ad8a093c3ab91122ab3a72b (patch)
treee9e37d432417ac382a36b9e6f26db38e59ca0585 /src/editfns.c
parent3de84ad9c45382c181e3383d433442f4e19ba722 (diff)
downloademacs-42a5b22fc0201fe98ad8a093c3ab91122ab3a72b.tar.gz
emacs-42a5b22fc0201fe98ad8a093c3ab91122ab3a72b.zip
Use SSDATA when the context wants char *.
* alloc.c, buffer.c, bytecode.c, callproc.c, dired.c: * dispnew.c, doc.c, editfns.c, emacs.c, fileio.c, filelock.c: * fns.c, font.c, frame.c, image.c, indent.c, keyboard.c: * lread.c, minibuf.c, print.c, process.c, search.c, widget.c: * xdisp.c, xfaces.c, xfns.c, xml.c, xselect.c, xterm.c: Use SSDATA (not SDATA) when the context of the expression wants char * (not unsigned char *).
Diffstat (limited to 'src/editfns.c')
-rw-r--r--src/editfns.c8
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. */)
1345 else if (STRINGP (uid)) 1345 else if (STRINGP (uid))
1346 { 1346 {
1347 BLOCK_INPUT; 1347 BLOCK_INPUT;
1348 pw = (struct passwd *) getpwnam (SDATA (uid)); 1348 pw = (struct passwd *) getpwnam (SSDATA (uid));
1349 UNBLOCK_INPUT; 1349 UNBLOCK_INPUT;
1350 } 1350 }
1351 else 1351 else
@@ -1372,7 +1372,7 @@ name, or nil if there is no such user. */)
1372 r = (unsigned char *) alloca (strlen (p) + SCHARS (login) + 1); 1372 r = (unsigned char *) alloca (strlen (p) + SCHARS (login) + 1);
1373 memcpy (r, p, q - p); 1373 memcpy (r, p, q - p);
1374 r[q - p] = 0; 1374 r[q - p] = 0;
1375 strcat (r, SDATA (login)); 1375 strcat (r, SSDATA (login));
1376 r[q - p] = UPCASE (r[q - p]); 1376 r[q - p] = UPCASE (r[q - p]);
1377 strcat (r, q + 1); 1377 strcat (r, q + 1);
1378 full = build_string (r); 1378 full = build_string (r);
@@ -1680,7 +1680,7 @@ For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z". */)
1680 1680
1681 buf[0] = '\1'; 1681 buf[0] = '\1';
1682 BLOCK_INPUT; 1682 BLOCK_INPUT;
1683 result = emacs_memftimeu (buf, size, SDATA (format_string), 1683 result = emacs_memftimeu (buf, size, SSDATA (format_string),
1684 SBYTES (format_string), 1684 SBYTES (format_string),
1685 tm, ut); 1685 tm, ut);
1686 UNBLOCK_INPUT; 1686 UNBLOCK_INPUT;
@@ -1691,7 +1691,7 @@ For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z". */)
1691 /* If buffer was too small, make it bigger and try again. */ 1691 /* If buffer was too small, make it bigger and try again. */
1692 BLOCK_INPUT; 1692 BLOCK_INPUT;
1693 result = emacs_memftimeu (NULL, (size_t) -1, 1693 result = emacs_memftimeu (NULL, (size_t) -1,
1694 SDATA (format_string), 1694 SSDATA (format_string),
1695 SBYTES (format_string), 1695 SBYTES (format_string),
1696 tm, ut); 1696 tm, ut);
1697 UNBLOCK_INPUT; 1697 UNBLOCK_INPUT;