X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswfaction.c;h=9a447989b58e44a4a661478ddc229060b3114fa2;hb=e23291bdd4c7bb58ca4ea9765872823e11d9108b;hp=70ddf3eabf288b51937c47945f4d06447622b153;hpb=d2238a05fee8463d460bbb4a0c22c021b560c096;p=swftools.git diff --git a/lib/modules/swfaction.c b/lib/modules/swfaction.c index 70ddf3e..9a44798 100644 --- a/lib/modules/swfaction.c +++ b/lib/modules/swfaction.c @@ -167,7 +167,7 @@ ActionTAG* swf_ActionGet(TAG*tag) length = swf_GetU16(tag); if(length) { - data = rfx_alloc(length); + data = (U8*)rfx_alloc(length); swf_GetBlock(tag, data, length); } else { data = 0; @@ -228,13 +228,13 @@ int OpAdvance(char c, U8*data) case 'f': return 2; case 'u': - return strlen(data)+1; + return strlen((const char*)data)+1; case 't': - return strlen(data)+1; + return strlen((const char*)data)+1; case 'l': - return strlen(data)+1; + return strlen((const char*)data)+1; case 'c': - return strlen(data)+1; + return strlen((const char*)data)+1; case 'C': return 2; case 's': @@ -248,7 +248,7 @@ int OpAdvance(char c, U8*data) case 'p': { U8 type = *data++; if(type == 0) { - return 1+strlen(data)+1; //string + return 1+strlen((const char*)data)+1; //string } else if (type == 1) { return 1+4; //float } else if (type == 2) { @@ -352,7 +352,7 @@ void swf_DumpActions(ActionTAG*atag, char*prefix) printf(" String:\"%s\"", data); #ifdef MAX_LOOKUP if (entrylen - replacelen + newlen); + int newlen = strlen((const char *)replacement); + char * newdata = (char*)rfx_alloc(atag->len - replacelen + newlen); int rpos = replacepos - atag->data; memcpy(newdata, atag->data, rpos); memcpy(&newdata[rpos], replacement, newlen); memcpy(&newdata[rpos+newlen], &replacepos[replacelen], &data[atag->len] - &replacepos[replacelen]); rfx_free(atag->data); - atag->data = newdata; + atag->data = (U8*)newdata; data = &atag->data[rpos+newlen+1]; } } @@ -1011,7 +1011,7 @@ ActionTAG* action_PushLookup16(ActionTAG*atag, U16 index) { atag = swf_AddActionTAG(atag, ACTION_PUSH, 0, 3); *(U8*)atag->tmp = 9; //lookup - *(U8*)&atag->tmp[1] = index; + *(U8*)&atag->tmp[1] = (U8)index; *(U8*)&atag->tmp[2] = index>>8; return atag; } @@ -1071,10 +1071,10 @@ ActionTAG* action_GetUrl(ActionTAG*atag, const char* url, char* label) { int l1= strlen(url); int l2= strlen(label); - char*ptr = rfx_alloc(l1+l2+2); + char*ptr = (char*)rfx_alloc(l1+l2+2); strcpy(ptr, url); strcpy(&ptr[l1+1], label); - return swf_AddActionTAG(atag, ACTION_GETURL, ptr, l1+l2+2); + return swf_AddActionTAG(atag, ACTION_GETURL, (U8*)ptr, l1+l2+2); } //TODO: ActionTAG* action_DefineFunction(ActionTAG*atag, U8*data, int len) {return atag;} @@ -1096,7 +1096,7 @@ ActionTAG* swf_ActionCompile(const char* source, int version) if(!ret || buffer==0 || len == 0) return 0; - swf_SetBlock(tag, buffer, len); + swf_SetBlock(tag, (U8*)buffer, len); swf_SetU8(tag, 0); rfx_free(buffer);