deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use PROCESS_NAME_STRING macro to handle NO_PROCESS_NAMES

Browse source
This commit is contained in:
David Kopf 2011-08-03 11:08:40 -04:00
parent 6ec85fe079
commit 44f4ee9315
8 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/process-list/process-list.c
View file

@ -90,7 +90,7 @@ update_processwindow(void)
CTK_WIDGET_ADD(&processwindow, &processidlabels[i]);
CTK_LABEL_NEW(&processnamelabels[i],
4, i + 1, 22, 1, (char *)p->name);
4, i + 1, 22, 1, PROCESS_NAME_STRING(p));
CTK_WIDGET_ADD(&processwindow, &processnamelabels[i]);
++i;

2
apps/shell/shell-ps.c
View file

@ -58,7 +58,7 @@ PROCESS_THREAD(shell_ps_process, ev, data)
shell_output_str(&ps_command, "Processes:", "");
for(p = PROCESS_LIST(); p != NULL; p = p->next) {
shell_output_str(&ps_command, (char *)p->name, "");
shell_output_str(&ps_command, PROCESS_NAME_STRING(p), "");
}
PROCESS_END();

11
apps/webserver-nano/httpd-cgi.c
View file

@ -359,16 +359,13 @@ make_processes(void *p)
{
static const char httpd_cgi_proc[] HTTPD_STRING_ATTR = "<tr align=\"center\"><td>%p</td><td>%s</td><td>%p</td><td>%s</td></tr>\r\n";
char name[40],tstate[20];
#if PROCESS_CONF_NO_PROCESS_NAMES
strcpy(name, "Not Available");
#else
strncpy(name, ((struct process *)p)->name, 40);
#endif
strncpy(name, PROCESS_NAME_STRING((struct process *)p), 40);
petsciiconv_toascii(name, 40);
httpd_strcpy(tstate,states[9 + ((struct process *)p)->state]);
return httpd_snprintf((char *)uip_appdata, uip_mss(), httpd_cgi_proc, p, name,
// *((char **)&(((struct process *)p)->thread)),
*(char **)(&(((struct process *)p)->thread)), //minimal net
// *((char **) &(((struct process *)p)->thread)),
* (char **)(&(((struct process *)p)->thread)), //minimal net
tstate);
}
/*---------------------------------------------------------------------------*/

4
apps/webserver/httpd-cgi.c
View file

@ -207,8 +207,8 @@ static unsigned short
make_processes(void *p)
{
char name[40];
strncpy(name, ((struct process *)p)->name, 40);
strncpy(name, PROCESS_NAME_STRING((struct process *)p), 40);
petsciiconv_toascii(name, 40);
return snprintf((char *)uip_appdata, uip_mss(),

3
core/loader/dlloader.c
View file

@ -61,7 +61,8 @@ dlloader_load(char *path, char *arg)
}
/* Start the process. */
printf("Starting '%s'\n", (*p)->name);
printf("Starting '%s'\n", PROCESS_NAME_STRING(*p));
process_start(*p, arg);
return LOADER_OK;

2
platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cgi.c
View file

@ -268,7 +268,7 @@ make_processes(void *p)
static const char httpd_cgi_proc[] HTTPD_STRING_ATTR = "<tr align=\"center\"><td>%p</td><td>%s</td><td>%p</td><td>%s</td></tr>\r\n";
char name[40],tstate[20];
strncpy(name, ((struct process *)p)->name, 40);
strncpy(name, PROCESS_NAME_STRING((struct process *)p), 40);
petsciiconv_toascii(name, 40);
httpd_strcpy(tstate,states[9 + ((struct process *)p)->state]);
return httpd_snprintf((char *)uip_appdata, uip_mss(), httpd_cgi_proc, p, name,

2
platform/avr-raven/apps/raven-webserver/httpd-cgi.c
View file

@ -269,7 +269,7 @@ make_processes(void *p)
static const char httpd_cgi_proc[] HTTPD_STRING_ATTR = "<tr align=\"center\"><td>%p</td><td>%s</td><td>%p</td><td>%s</td></tr>\r\n";
char name[40],tstate[20];
strncpy(name, ((struct process *)p)->name, 40);
strncpy(name, PROCESS_NAME_STRING((struct process *)p), 40);
petsciiconv_toascii(name, 40);
httpd_strcpy(tstate,states[9 + ((struct process *)p)->state]);
return httpd_snprintf((char *)uip_appdata, uip_mss(), httpd_cgi_proc, p, name,

2
platform/pc-6001/apps/webserver-mini/httpd-cgi.c
View file

@ -197,7 +197,7 @@ make_processes(void *p)
{
char name[40];
strncpy(name, ((struct process *)p)->name, 40);
strncpy(name, PROCESS_NAME_STRING((struct process *)p), 40);
petsciiconv_toascii(name, 40);
return sprintf((char *)uip_appdata,