minhtrannhat/os161
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed printsf, an unused secure testing printf variant. This variant does not apply now that each test has its own secret.

Browse Source 
Fixed unused variable in libtest161 in kernel compiles.
This commit is contained in:
Scott Haseley
2016-02-29 16:43:35 -05:00
parent a5963a0e31
commit e7ec655415
4 changed files with 9 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
common/libc/printf/tprintf.c
View File

@@ -16,9 +16,9 @@ tprintf(const char *fmt, ...)
int chars;
va_list ap;
if (strcmp(SECRET, "") != 0) {
return 0;
}
#ifdef SECRET_TESTING
return 0;
#endif
va_start(ap, fmt);
chars = vprintf(fmt, ap);
@@ -34,9 +34,9 @@ nprintf(const char *fmt, ...)
int chars;
va_list ap;
if (strcmp(SECRET, "") == 0) {
return 0;
}
#ifndef SECRET_TESTING
return 0;
#endif
va_start(ap, fmt);
chars = vprintf(fmt, ap);
@@ -44,20 +44,3 @@ nprintf(const char *fmt, ...)
return chars;
}
/* printf variant that prepends the kernel secret */
int
printsf(const char *fmt, ...)
{
int chars;
va_list ap;
if (strcmp(SECRET, "") != 0) {
printf("%s: ", SECRET);
}
va_start(ap, fmt);
chars = vprintf(fmt, ap);
va_end(ap);
return chars;
}

4
common/libtest161/test161.c
View File

@@ -19,13 +19,15 @@
// Hack for allocating userspace memory without malloc.
#define BUFFER_SIZE 4096
#ifndef _KERNEL
static char temp_buffer[BUFFER_SIZE];
static char write_buffer[BUFFER_SIZE];
#endif
static inline void * _alloc(size_t size)
{
#ifdef _KERNEL
(void)temp_buffer;
return kmalloc(size);
#else
(void)size;