kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

add BLI_strcpy_rlen, replace strcat, which was used in misleading way.

Browse Source
This commit is contained in:
Campbell Barton 2013-06-16 08:29:02 +00:00
parent fcc4251c07
commit c9341334b1
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenlib/BLI_string.h
View File

@ -72,6 +72,13 @@ __attribute__((nonnull))
#endif #endif
; ;
size_t BLI_strcpy_rlen(char *__restrict dst, const char *__restrict src)
#ifdef __GNUC__
__attribute__((warn_unused_result))
__attribute__((nonnull))
#endif
;
char *BLI_str_quoted_substrN(const char *__restrict str, const char *__restrict prefix) char *BLI_str_quoted_substrN(const char *__restrict str, const char *__restrict prefix)
#ifdef __GNUC__ #ifdef __GNUC__
__attribute__((warn_unused_result)) __attribute__((warn_unused_result))

7
source/blender/blenlib/intern/string.c
View File

@ -139,6 +139,13 @@ size_t BLI_strncpy_rlen(char *__restrict dst, const char *__restrict src, const
return srclen; return srclen;
} }
size_t BLI_strcpy_rlen(char *__restrict dst, const char *__restrict src)
{
size_t srclen = strlen(src);
memcpy(dst, src, srclen + 1);
return srclen;
}
/** /**
* Portable replacement for #vsnprintf * Portable replacement for #vsnprintf
*/ */

8
source/blender/editors/interface/interface.c
View File

@ -2371,13 +2371,13 @@ void ui_check_but(uiBut *but)
char *str = but->drawstr; char *str = but->drawstr;
if (but->modifier_key & KM_SHIFT) if (but->modifier_key & KM_SHIFT)
str = strcat(str, "Shift "); str += BLI_strcpy_rlen(str, "Shift ");
if (but->modifier_key & KM_CTRL) if (but->modifier_key & KM_CTRL)
str = strcat(str, "Ctrl "); str += BLI_strcpy_rlen(str, "Ctrl ");
if (but->modifier_key & KM_ALT) if (but->modifier_key & KM_ALT)
str = strcat(str, "Alt "); str += BLI_strcpy_rlen(str, "Alt ");
if (but->modifier_key & KM_OSKEY) if (but->modifier_key & KM_OSKEY)
str = strcat(str, "Cmd "); str += BLI_strcpy_rlen(str, "Cmd ");
(void)str; /* UNUSED */ (void)str; /* UNUSED */
} }