diff options
| author | Joakim Verona | 2013-08-14 06:41:21 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-14 06:41:21 +0200 |
| commit | ce7942f31ff4f4902ef2648020f2b96047b68cda (patch) | |
| tree | 3ff00d16fc12763746148ce38a6a7949336e42da /src/image.c | |
| parent | 77df9fad7b2d502eb6f50752b57f6797296fa72a (diff) | |
| parent | da5707e8ec8df0a8a9bb1a1f12c6b701314845cc (diff) | |
| download | emacs-ce7942f31ff4f4902ef2648020f2b96047b68cda.tar.gz emacs-ce7942f31ff4f4902ef2648020f2b96047b68cda.zip | |
merge from trunk
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/image.c b/src/image.c index e767d5447d1..99bb9d8c135 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -7851,9 +7851,9 @@ static char* | |||
| 7851 | imagemagick_filename_hint (Lisp_Object spec) | 7851 | imagemagick_filename_hint (Lisp_Object spec) |
| 7852 | { | 7852 | { |
| 7853 | Lisp_Object format = image_spec_value (spec, intern (":format"), NULL); | 7853 | Lisp_Object format = image_spec_value (spec, intern (":format"), NULL); |
| 7854 | Lisp_Object symbol = intern ("image-format-suffixes"); | 7854 | Lisp_Object val, symbol = intern ("image-format-suffixes"); |
| 7855 | Lisp_Object val; | 7855 | const char *prefix = "/tmp/foo."; |
| 7856 | char *name, *prefix = "/tmp/foo."; | 7856 | char *name; |
| 7857 | 7857 | ||
| 7858 | if (NILP (Fboundp (symbol))) | 7858 | if (NILP (Fboundp (symbol))) |
| 7859 | return NULL; | 7859 | return NULL; |
| @@ -7871,8 +7871,8 @@ imagemagick_filename_hint (Lisp_Object spec) | |||
| 7871 | return NULL; | 7871 | return NULL; |
| 7872 | 7872 | ||
| 7873 | name = xmalloc (strlen (prefix) + SBYTES (val) + 1); | 7873 | name = xmalloc (strlen (prefix) + SBYTES (val) + 1); |
| 7874 | strcpy(name, prefix); | 7874 | strcpy (name, prefix); |
| 7875 | strcat(name, SDATA (val)); | 7875 | strcat (name, SSDATA (val)); |
| 7876 | return name; | 7876 | return name; |
| 7877 | } | 7877 | } |
| 7878 | 7878 | ||