Author: mjordan Date: Sun Mar 29 20:51:59 2015 New Revision: 433717 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=433717 Log: clang compiler warnings: Fix warning for -Wgnu-variable-sized-type-not-at-end
This patch fixes a warning caught by clang, wherein a variable sized struct is not located at the end of a struct. While the code in question actually expected this, this is a good warning to watch for. Hence, this patch refactors the code in question to not have two variable length elements in the same struct. Review: https://reviewboard.asterisk.org/r/4530/ ASTERISK-24917 Reported by: dkdegroot patches: rb4530.patch submitted by dkdegroot (License 6600) Modified: branches/11/main/stdtime/localtime.c Modified: branches/11/main/stdtime/localtime.c URL: http://svnview.digium.com/svn/asterisk/branches/11/main/stdtime/localtime.c?view=diff&rev=433717&r1=433716&r2=433717 ============================================================================== --- branches/11/main/stdtime/localtime.c (original) +++ branches/11/main/stdtime/localtime.c Sun Mar 29 20:51:59 2015 @@ -354,10 +354,9 @@ static void *inotify_daemon(void *data) { - struct { - struct inotify_event iev; - char name[FILENAME_MAX + 1]; - } buf; + /* inotify_event is dynamically sized */ + struct inotify_event *iev; + size_t real_sizeof_iev = sizeof(*iev) + FILENAME_MAX + 1; ssize_t res; struct state *cur; @@ -372,14 +371,15 @@ inotify_thread = AST_PTHREADT_NULL; return NULL; } + iev = ast_alloca(real_sizeof_iev); common_startup(); for (;/*ever*/;) { /* This read should block, most of the time. */ - if ((res = read(inotify_fd, &buf, sizeof(buf))) < sizeof(buf.iev) && res > 0) { + if ((res = read(inotify_fd, &iev, real_sizeof_iev)) < sizeof(*iev) && res > 0) { /* This should never happen */ - ast_log(LOG_ERROR, "Inotify read less than a full event (%zd < %zu)?!!\n", res, sizeof(buf.iev)); + ast_log(LOG_ERROR, "Inotify read less than a full event (%zd < %zu)?!!\n", res, sizeof(*iev)); break; } else if (res < 0) { if (errno == EINTR || errno == EAGAIN) { @@ -395,7 +395,7 @@ } AST_LIST_LOCK(&zonelist); AST_LIST_TRAVERSE_SAFE_BEGIN(&zonelist, cur, list) { - if (cur->wd[0] == buf.iev.wd || cur->wd[1] == buf.iev.wd) { + if (cur->wd[0] == iev->wd || cur->wd[1] == iev->wd) { AST_LIST_REMOVE_CURRENT(list); sstate_free(cur); break; -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
