o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more little compile fixes

Browse source
This commit is contained in:
rsc 2004-12-28 01:45:05 +00:00
parent 7ffc5208a8
commit 22c7ebffda
6 changed files with 20 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/cmd/acid/acid.h
View file

@ -256,7 +256,6 @@ void unwind(void);
void userinit(void); void userinit(void);
void varreg(void); void varreg(void);
void varsym(void); void varsym(void);
Waitmsg* waitfor(int);
void whatis(Lsym*); void whatis(Lsym*);
void windir(Map*, Node*, Node*, Node*); void windir(Map*, Node*, Node*, Node*);
void yyerror(char*, ...); void yyerror(char*, ...);

14
src/cmd/acid/proc.c
View file

@ -245,17 +245,3 @@ getstatus(int pid)
return buf+56; /* ditto */ return buf+56; /* ditto */
} }
Waitmsg*
waitfor(int pid)
{
Waitmsg *w;
for(;;) {
if((w = wait()) == nil)
error("wait %r");
if(w->pid == pid)
return w;
free(w);
}
return nil; /* ken */
}

3
src/cmd/mk/fns.h
View file

@ -1,3 +1,6 @@
#undef waitfor
#define waitfor mkwaitfor
void addrule(char*, Word*, char*, Word*, int, int, char*); void addrule(char*, Word*, char*, Word*, int, int, char*);
void addrules(Word*, Word*, char*, int, int, char*); void addrules(Word*, Word*, char*, int, int, char*);
void addw(Word*, char*); void addw(Word*, char*);

3
src/cmd/sam/sam.h
View file

@ -3,6 +3,9 @@
#include <plumb.h> #include <plumb.h>
#include "errors.h" #include "errors.h"
#undef waitfor
#define waitfor samwaitfor
/* /*
* BLOCKSIZE is relatively small to keep memory consumption down. * BLOCKSIZE is relatively small to keep memory consumption down.
*/ */

20
src/cmd/sam/unix.c
View file

@ -177,16 +177,20 @@ tempdisk(void)
return fd; return fd;
} }
#undef wait #undef waitfor
int int
waitfor(int pid) samwaitfor(int pid)
{ {
int wm; int r;
int rpid; Waitmsg *w;
do; while((rpid = wait(&wm)) != pid && rpid != -1); w = p9waitfor(pid);
return (WEXITSTATUS(wm)); if(w == nil)
} return -1;
r = atoi(w->msg);
free(w);
return r;
}
void void
samerr(char *buf) samerr(char *buf)

4
src/libsec/port/aes.c
View file

@ -43,9 +43,9 @@ static const u32 Td3[256];
static const u8 Te4[256]; static const u8 Te4[256];
static int rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits); static int rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits);
/* #ifdef NOTUSED
static int rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits); static int rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits);
*/ #endif
static int rijndaelKeySetup(u32 erk[/*4*(Nr + 1)*/], u32 drk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits); static int rijndaelKeySetup(u32 erk[/*4*(Nr + 1)*/], u32 drk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits);
static void rijndaelEncrypt(const u32int rk[], int Nr, const uchar pt[16], uchar ct[16]); static void rijndaelEncrypt(const u32int rk[], int Nr, const uchar pt[16], uchar ct[16]);
static void rijndaelDecrypt(const u32int rk[], int Nr, const uchar ct[16], uchar pt[16]); static void rijndaelDecrypt(const u32int rk[], int Nr, const uchar ct[16], uchar pt[16]);