diff options
| author | Willem Jan Palenstijn | 2013-09-24 13:55:54 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-09-24 13:55:54 +0200 |
| commit | 6417192584873f98737a0928adefeb9aa9cad894 (patch) | |
| tree | 0d238f05c406ae70fff8c907bd10d29a16f2d6a4 /backends/platform/tizen/sscanf.cpp | |
| parent | f3514534ce46bad5e3ffadfdf0b3af403045e5ef (diff) | |
| parent | 74cc4aec8aa80da2541857e3120b31a566ccdff3 (diff) | |
| download | scummvm-rg350-6417192584873f98737a0928adefeb9aa9cad894.tar.gz scummvm-rg350-6417192584873f98737a0928adefeb9aa9cad894.tar.bz2 scummvm-rg350-6417192584873f98737a0928adefeb9aa9cad894.zip | |
Merge branch 'master' into zvision
Conflicts:
video/avi_decoder.cpp
Diffstat (limited to 'backends/platform/tizen/sscanf.cpp')
| -rw-r--r-- | backends/platform/tizen/sscanf.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/backends/platform/tizen/sscanf.cpp b/backends/platform/tizen/sscanf.cpp index aa846698f6..75f009cc61 100644 --- a/backends/platform/tizen/sscanf.cpp +++ b/backends/platform/tizen/sscanf.cpp @@ -93,7 +93,7 @@ bool scanStringUntil(const char **in, va_list *ap, char c_end) { char *arg = va_arg(*ap, char*); while (**in && **in != c_end) { *arg = **in; - *arg++; + arg++; (*in)++; } *arg = 0; |