diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-02 13:22:35 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-06 14:58:38 +0200 |
| commit | 3dbe8d9cde176fb3bd8ea1da8a5f2092fbda369e (patch) | |
| tree | a0f43e9bd040f8fed350d65910e76c2477da918b | |
| parent | 955b3d82646a6487fa0df2c0f4772566e8cb0bf3 (diff) | |
don't take addresses of temporary arrays
for gcc 4.7, this is an error
Change-Id: Ia65da9f5547bab983e20e34f02bdc0c5f37e2270
Reviewed-by: Tapani Mikola <tapani.mikola@nokia.com>
| -rw-r--r-- | tests/auto/client/test-jsondb-client.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/client/test-jsondb-client.cpp b/tests/auto/client/test-jsondb-client.cpp index 03099c4..7374700 100644 --- a/tests/auto/client/test-jsondb-client.cpp +++ b/tests/auto/client/test-jsondb-client.cpp @@ -330,16 +330,17 @@ void TestJsonDbClient::initTestCase() QByteArray app2NameBA = app2Name.toLocal8Bit(); if (!errno) { // Add primary groups + char *members[] = { NULL }; struct group grp; grp.gr_name = appNameBA.data(); grp.gr_passwd = NULL; grp.gr_gid = gid; - grp.gr_mem = (char *[]){NULL}; + grp.gr_mem = members; struct group grp2; grp2.gr_name = app2NameBA.data(); grp2.gr_passwd = NULL; grp2.gr_gid = gid2; - grp2.gr_mem = (char *[]){NULL}; + grp2.gr_mem = members; QByteArray etcigrBA = etcigr.toLocal8Bit(); FILE *grfile = ::fopen (etcigrBA.data(), "a"); ::putgrent(&grp, grfile); @@ -371,13 +372,14 @@ void TestJsonDbClient::initTestCase() ::putpwent(&pwd2, pwdfile); ::fclose (pwdfile); + char *members2[] = { appNameBA.data(), NULL }; // Add 'User' supplementary group gid = nextFreeGid(gid2+1); grp.gr_name = const_cast<char *>("User"); grp.gr_passwd = NULL; grp.gr_gid = gid; // Add only the first user to it - grp.gr_mem = (char *[]){appNameBA.data(), NULL}; + grp.gr_mem = members2; grfile = ::fopen (etcigrBA.data(), "a"); ::putgrent(&grp, grfile); ::fclose (grfile); |