Rename labels.

Rename labels from FOO to label_foo in order to avoid system macro
definitions, in particular OUT and ERROR on mingw.

Reported by Mike Hommey.
This commit is contained in:
Jason Evans
2012-04-10 15:07:44 -07:00
parent eae269036c
commit a1ee7838e1
11 changed files with 129 additions and 129 deletions

View File

@@ -25,7 +25,7 @@ thread_start(void *arg)
#ifdef JEMALLOC_STATS
assert(false);
#endif
goto RETURN;
goto label_return;
}
fprintf(stderr, "%s(): Error in mallctl(): %s\n", __func__,
strerror(err));
@@ -37,7 +37,7 @@ thread_start(void *arg)
#ifdef JEMALLOC_STATS
assert(false);
#endif
goto RETURN;
goto label_return;
}
fprintf(stderr, "%s(): Error in mallctl(): %s\n", __func__,
strerror(err));
@@ -51,7 +51,7 @@ thread_start(void *arg)
#ifdef JEMALLOC_STATS
assert(false);
#endif
goto RETURN;
goto label_return;
}
fprintf(stderr, "%s(): Error in mallctl(): %s\n", __func__,
strerror(err));
@@ -63,7 +63,7 @@ thread_start(void *arg)
#ifdef JEMALLOC_STATS
assert(false);
#endif
goto RETURN;
goto label_return;
}
fprintf(stderr, "%s(): Error in mallctl(): %s\n", __func__,
strerror(err));
@@ -98,7 +98,7 @@ thread_start(void *arg)
assert(d0 + usize <= d1);
RETURN:
label_return:
return (NULL);
}
@@ -116,7 +116,7 @@ main(void)
!= 0) {
fprintf(stderr, "%s(): Error in pthread_create()\n", __func__);
ret = 1;
goto RETURN;
goto label_return;
}
pthread_join(thread, (void *)&ret);
@@ -126,13 +126,13 @@ main(void)
!= 0) {
fprintf(stderr, "%s(): Error in pthread_create()\n", __func__);
ret = 1;
goto RETURN;
goto label_return;
}
pthread_join(thread, (void *)&ret);
thread_start(NULL);
RETURN:
label_return:
fprintf(stderr, "Test end\n");
return (ret);
}

View File

@@ -22,7 +22,7 @@ main(void)
fprintf(stderr, "%s(): Error in mallctl(): %s\n", __func__,
strerror(err));
ret = 1;
goto RETURN;
goto label_return;
}
chunksize = ((size_t)1U) << lg_chunk;
@@ -30,7 +30,7 @@ main(void)
if (p == NULL) {
fprintf(stderr, "malloc(%zu) --> %p\n", chunksize, p);
ret = 1;
goto RETURN;
goto label_return;
}
memset(p, 'a', chunksize);
@@ -39,7 +39,7 @@ main(void)
fprintf(stderr, "realloc(%p, %zu) --> %p\n", p, chunksize * 2,
q);
ret = 1;
goto RETURN;
goto label_return;
}
for (i = 0; i < chunksize; i++) {
assert(q[i] == 'a');
@@ -51,7 +51,7 @@ main(void)
if (q == NULL) {
fprintf(stderr, "realloc(%p, %zu) --> %p\n", p, chunksize, q);
ret = 1;
goto RETURN;
goto label_return;
}
for (i = 0; i < chunksize; i++) {
assert(q[i] == 'a');
@@ -60,7 +60,7 @@ main(void)
free(q);
ret = 0;
RETURN:
label_return:
fprintf(stderr, "Test end\n");
return (ret);
}

View File

@@ -61,7 +61,7 @@ main(void)
if (p == NULL) {
fprintf(stderr, "%s(): Error in malloc()\n", __func__);
ret = 1;
goto RETURN;
goto label_return;
}
size = sizeof(arena_ind);
@@ -69,7 +69,7 @@ main(void)
fprintf(stderr, "%s(): Error in mallctl(): %s\n", __func__,
strerror(err));
ret = 1;
goto RETURN;
goto label_return;
}
for (i = 0; i < NTHREADS; i++) {
@@ -78,14 +78,14 @@ main(void)
fprintf(stderr, "%s(): Error in pthread_create()\n",
__func__);
ret = 1;
goto RETURN;
goto label_return;
}
}
for (i = 0; i < NTHREADS; i++)
pthread_join(threads[i], (void *)&ret);
RETURN:
label_return:
fprintf(stderr, "Test end\n");
return (ret);
}

View File

@@ -22,7 +22,7 @@ thread_start(void *arg)
assert(false);
#endif
}
goto RETURN;
goto label_return;
}
if (e0) {
@@ -69,7 +69,7 @@ thread_start(void *arg)
assert(e0 == false);
free(malloc(1));
RETURN:
label_return:
return (NULL);
}
@@ -87,7 +87,7 @@ main(void)
!= 0) {
fprintf(stderr, "%s(): Error in pthread_create()\n", __func__);
ret = 1;
goto RETURN;
goto label_return;
}
pthread_join(thread, (void *)&ret);
@@ -97,13 +97,13 @@ main(void)
!= 0) {
fprintf(stderr, "%s(): Error in pthread_create()\n", __func__);
ret = 1;
goto RETURN;
goto label_return;
}
pthread_join(thread, (void *)&ret);
thread_start(NULL);
RETURN:
label_return:
fprintf(stderr, "Test end\n");
return (ret);
}