1
0
mirror of https://github.com/golang/go synced 2024-11-13 19:10:22 -07:00

runtime: change int32 to intgo in findnull and findnullw

Update #6046.
This CL just does findnull and findnullw. There are other functions
to fix but doing them a few at a time will help isolate any (unlikely)
breakages these changes bring up in architectures I can't test
myself.

R=golang-dev, dsymonds
CC=golang-dev
https://golang.org/cl/12520043
This commit is contained in:
Rob Pike 2013-08-06 21:49:03 +10:00
parent 429a67e300
commit 82f5ca1ef0
9 changed files with 16 additions and 13 deletions

View File

@ -8,7 +8,8 @@
byte* byte*
runtime·getenv(int8 *s) runtime·getenv(int8 *s)
{ {
int32 fd, len, n, r; int32 fd, n, r;
intgo len;
byte file[128]; byte file[128];
byte *p; byte *p;

View File

@ -11,7 +11,8 @@ Slice syscall·envs;
byte* byte*
runtime·getenv(int8 *s) runtime·getenv(int8 *s)
{ {
int32 i, j, len; int32 i, j;
intgo len;
byte *v, *bs; byte *v, *bs;
String* envv; String* envv;
int32 envc; int32 envc;

View File

@ -194,7 +194,8 @@ runtime·goexitsall(int8 *status)
int32 int32
runtime·postnote(int32 pid, int8* msg) runtime·postnote(int32 pid, int8* msg)
{ {
int32 fd, len; int32 fd;
intgo len;
uint8 buf[128]; uint8 buf[128];
uint8 tmp[16]; uint8 tmp[16];
uint8 *p, *q; uint8 *p, *q;

View File

@ -32,7 +32,7 @@ runtime·sighandler(void *v, int8 *s, G *gp)
Ureg *ureg; Ureg *ureg;
uintptr *sp; uintptr *sp;
SigTab *sig, *nsig; SigTab *sig, *nsig;
int32 len, i; intgo len, i;
if(!s) if(!s)
return NCONT; return NCONT;

View File

@ -40,7 +40,7 @@ runtime·sighandler(void *v, int8 *s, G *gp)
Ureg *ureg; Ureg *ureg;
uintptr *sp; uintptr *sp;
SigTab *sig, *nsig; SigTab *sig, *nsig;
int32 len, i; intgo i, len;
if(!s) if(!s)
return NCONT; return NCONT;

View File

@ -12,7 +12,7 @@ static void vprintf(int8*, byte*);
// write to goroutine-local buffer if diverting output, // write to goroutine-local buffer if diverting output,
// or else standard error. // or else standard error.
static void static void
gwrite(void *v, int32 n) gwrite(void *v, intgo n)
{ {
if(g == nil || g->writebuf == nil) { if(g == nil || g->writebuf == nil) {
runtime·write(2, v, n); runtime·write(2, v, n);

View File

@ -393,7 +393,7 @@ void
runtime·parsedebugvars(void) runtime·parsedebugvars(void)
{ {
byte *p; byte *p;
int32 i, n; intgo i, n;
p = runtime·getenv("GODEBUG"); p = runtime·getenv("GODEBUG");
if(p == nil) if(p == nil)

View File

@ -717,8 +717,8 @@ extern DebugVars runtime·debug;
*/ */
int32 runtime·strcmp(byte*, byte*); int32 runtime·strcmp(byte*, byte*);
byte* runtime·strstr(byte*, byte*); byte* runtime·strstr(byte*, byte*);
int32 runtime·findnull(byte*); intgo runtime·findnull(byte*);
int32 runtime·findnullw(uint16*); intgo runtime·findnullw(uint16*);
void runtime·dump(byte*, int32); void runtime·dump(byte*, int32);
int32 runtime·runetochar(byte*, int32); int32 runtime·runetochar(byte*, int32);
int32 runtime·charntorune(int32*, uint8*, int32); int32 runtime·charntorune(int32*, uint8*, int32);

View File

@ -10,10 +10,10 @@ package runtime
String runtime·emptystring; String runtime·emptystring;
int32 intgo
runtime·findnull(byte *s) runtime·findnull(byte *s)
{ {
int32 l; intgo l;
if(s == nil) if(s == nil)
return 0; return 0;
@ -22,10 +22,10 @@ runtime·findnull(byte *s)
return l; return l;
} }
int32 intgo
runtime·findnullw(uint16 *s) runtime·findnullw(uint16 *s)
{ {
int32 l; intgo l;
if(s == nil) if(s == nil)
return 0; return 0;