### patch number: 25 ### area: (1) aphone client man page, (2) dia server, ### and (3) makedepend util ### severity: minor ### comments: patch using command "(cd ; patch -p < thisfile)" ### (1) formatting problem with aphone.man ### (2) Per Guido Van Rossum report, pass NULL to gettimeofday ### in dia/task.c ### (3) Per Joel Emer, declare arguments for Alpha ### in makedepend/main.c. *** ./patchlevel.h Wed Mar 3 16:02:55 1993 --- /crl/audio/./patchlevel.h Fri Mar 5 11:30:15 1993 *************** *** 1 **** ! #define PATCHLEVEL 24 --- 1 ---- ! #define PATCHLEVEL 25 *** ./AF/server/dia/task.c Mon Feb 8 08:17:11 1993 --- /crl/audio/./AF/server/dia/task.c Mon Jun 14 08:13:16 1993 *************** *** 39,45 **** */ #if !defined(lint) && !defined(SABER) ! static char rcsid_task_c[] = "$Header: /crl/audio/AF/server/dia/RCS/task.c,v 1.13 1993/02/08 13:16:51 stewart Exp $"; #endif #include "task.h" --- 39,45 ---- */ #if !defined(lint) && !defined(SABER) ! static char rcsid_task_c[] = "$Header: /crl/audio/AF/server/dia/RCS/task.c,v 1.14 1993/06/14 12:14:43 tml Exp $"; #endif #include "task.h" *************** *** 223,229 **** #endif { int cur; - struct timezone tzp; if (taskQueue == NULL) { ErrorF("AddTask: task Queue not initialized!\n"); --- 223,228 ---- *************** *** 235,241 **** /* Finish setting up the task structure. */ task->proc = proc; ! if (gettimeofday(&task->systime, &tzp) != 0) { ErrorF("gettimeofday failed!\n"); } AddTime(&task->systime, ms); --- 234,240 ---- /* Finish setting up the task structure. */ task->proc = proc; ! if (gettimeofday(&task->systime, (struct timezone *)NULL) != 0) { ErrorF("gettimeofday failed!\n"); } AddTime(&task->systime, ms); *************** *** 270,281 **** { static struct timeval tv; struct timeval *cur; - struct timezone tz; if (numTasks == 0) { return NULL; /* No tasks to run. */ } ! if (gettimeofday(&tv, &tz) != 0) { ErrorF("TimeOfNextTask: gettimeofday failed!\n"); } cur = &taskQueue[1]->systime; --- 269,279 ---- { static struct timeval tv; struct timeval *cur; if (numTasks == 0) { return NULL; /* No tasks to run. */ } ! if (gettimeofday(&tv, (struct timezone *) NULL) != 0) { ErrorF("TimeOfNextTask: gettimeofday failed!\n"); } cur = &taskQueue[1]->systime; *************** *** 361,370 **** { TaskPtr task; struct timeval tv; - struct timezone tz; while (numTasks > 0) { ! gettimeofday(&tv, &tz); AddTime(&tv, RUN_TASK_BAND); task = taskQueue[1]; if ( TimeLessThan(task->systime, tv)) --- 359,367 ---- { TaskPtr task; struct timeval tv; while (numTasks > 0) { ! gettimeofday(&tv, (struct timezone *)NULL); AddTime(&tv, RUN_TASK_BAND); task = taskQueue[1]; if ( TimeLessThan(task->systime, tv)) *** ./AF/util/makedepend/main.c Fri Mar 5 17:04:26 1993 --- /crl/audio/./AF/util/makedepend/main.c Mon Jun 14 08:46:18 1993 *************** *** 447,452 **** --- 447,455 ---- /*VARARGS*/ fatal(x0,x1,x2,x3,x4,x5,x6,x7,x8,x9) + #ifdef __alpha + long x0,x1,x2,x3,x4,x5,x6,x7,x8,x9; + #endif { warning(x0,x1,x2,x3,x4,x5,x6,x7,x8,x9); exit (1); *************** *** 454,459 **** --- 457,465 ---- /*VARARGS0*/ warning(x0,x1,x2,x3,x4,x5,x6,x7,x8,x9) + #ifdef __alpha + long x0,x1,x2,x3,x4,x5,x6,x7,x8,x9; + #endif { fprintf(stderr, "%s: ", ProgramName); fprintf(stderr, (char *)x0,x1,x2,x3,x4,x5,x6,x7,x8,x9); *** ./AF/clients/aphone/aphone.man Fri Feb 12 12:10:27 1993 --- /crl/audio/./AF/clients/aphone/aphone.man Mon Jun 14 08:17:31 1993 *************** *** 14,21 **** .B [\fInumber\fP] .IP Dials the number specified. Valid characters in the number are ! '0' through '9', '*', '#', and 'A' through 'D'. In addition, the character ! ',' introduces a 500 millisecond delay. .SH ENVIRONMENT .TP 15 .B AUDIOFILE --- 14,21 ---- .B [\fInumber\fP] .IP Dials the number specified. Valid characters in the number are ! 0 through 9, *, #, and A through D. In addition, ! the comma character (,) introduces a 500 millisecond delay. .SH ENVIRONMENT .TP 15 .B AUDIOFILE