From 67040c3ce9295672ffc81c7d2481ae2fd3bc200f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Thu, 22 Jan 1998 00:51:41 +0100
Subject: [PATCH] Now seems to work on Digital Unix.
Rev: src/fdlib.c:1.8
Rev: src/fdlib.h:1.6
Rev: src/modules/Image/colortable.c:1.35
Rev: src/modules/Image/encodings/gif.c:1.29
Rev: src/modules/files/file.c:1.68
---
src/fdlib.c | 4 ++--
src/fdlib.h | 4 ++--
src/modules/Image/colortable.c | 8 ++++----
src/modules/Image/encodings/gif.c | 28 +++++++++++++++-------------
src/modules/files/file.c | 4 ++--
5 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/src/fdlib.c b/src/fdlib.c
index 0053573e5c..f63504eaef 100644
--- a/src/fdlib.c
+++ b/src/fdlib.c
@@ -218,8 +218,8 @@ SOCKFUN2(bind, struct sockaddr *, int)
SOCKFUN2(connect, struct sockaddr *, int)
SOCKFUN4(getsockopt,int,int,void*,int*)
SOCKFUN4(setsockopt,int,int,void*,int)
-SOCKFUN2(getsockname,struct sockaddr *,int*)
-SOCKFUN2(getpeername,struct sockaddr *,int*)
+SOCKFUN2(getsockname,struct sockaddr *,int *)
+SOCKFUN2(getpeername,struct sockaddr *,int *)
SOCKFUN3(recv,void *,int,int)
SOCKFUN5(recvfrom,void *,int,int,struct sockaddr *,int*)
SOCKFUN5(sendto,void *,int,int,struct sockaddr *,int*)
diff --git a/src/fdlib.h b/src/fdlib.h
index b2ddd7aa63..fc7139899d 100644
--- a/src/fdlib.h
+++ b/src/fdlib.h
@@ -49,8 +49,8 @@ SOCKFUN2(bind, struct sockaddr *, int)
SOCKFUN2(connect, struct sockaddr *, int)
SOCKFUN4(getsockopt,int,int,void*,int*)
SOCKFUN4(setsockopt,int,int,void*,int)
-SOCKFUN2(getsockname,struct sockaddr *,int*)
-SOCKFUN2(getpeername,struct sockaddr *,int*)
+SOCKFUN2(getsockname,struct sockaddr *,int *)
+SOCKFUN2(getpeername,struct sockaddr *,int *)
SOCKFUN3(recv,void *,int,int)
SOCKFUN5(recvfrom,void *,int,int,struct sockaddr *,int*)
SOCKFUN5(sendto,void *,int,int,struct sockaddr *,int*)
diff --git a/src/modules/Image/colortable.c b/src/modules/Image/colortable.c
index 40789a222a..15916b7d4b 100644
--- a/src/modules/Image/colortable.c
+++ b/src/modules/Image/colortable.c
@@ -1,11 +1,11 @@
#include <config.h>
-/* $Id: colortable.c,v 1.34 1998/01/16 22:09:08 grubba Exp $ */
+/* $Id: colortable.c,v 1.35 1998/01/21 23:51:38 grubba Exp $ */
/*
**! module Image
**! note
-**! $Id: colortable.c,v 1.34 1998/01/16 22:09:08 grubba Exp $
+**! $Id: colortable.c,v 1.35 1998/01/21 23:51:38 grubba Exp $
**! class colortable
**!
**! This object keeps colortable information,
@@ -21,7 +21,7 @@
#undef COLORTABLE_REDUCE_DEBUG
#include "global.h"
-RCSID("$Id: colortable.c,v 1.34 1998/01/16 22:09:08 grubba Exp $");
+RCSID("$Id: colortable.c,v 1.35 1998/01/21 23:51:38 grubba Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -2342,7 +2342,7 @@ void image_colortable_cast_to_string(struct neo_colortable *nct)
{
struct pike_string *str;
str=begin_shared_string(image_colortable_size(nct)*3);
- image_colortable_write_rgb(nct,str->str);
+ image_colortable_write_rgb(nct,(unsigned char *)str->str);
push_string(end_shared_string(str));
}
diff --git a/src/modules/Image/encodings/gif.c b/src/modules/Image/encodings/gif.c
index d6443411c1..cec07adab8 100644
--- a/src/modules/Image/encodings/gif.c
+++ b/src/modules/Image/encodings/gif.c
@@ -1,9 +1,9 @@
-/* $Id: gif.c,v 1.28 1998/01/20 15:53:17 grubba Exp $ */
+/* $Id: gif.c,v 1.29 1998/01/21 23:51:39 grubba Exp $ */
/*
**! module Image
**! note
-**! $Id: gif.c,v 1.28 1998/01/20 15:53:17 grubba Exp $
+**! $Id: gif.c,v 1.29 1998/01/21 23:51:39 grubba Exp $
**! submodule GIF
**!
**! This submodule keep the GIF encode/decode capabilities
@@ -31,7 +31,7 @@
#include "stralloc.h"
#include "global.h"
-RCSID("$Id: gif.c,v 1.28 1998/01/20 15:53:17 grubba Exp $");
+RCSID("$Id: gif.c,v 1.29 1998/01/21 23:51:39 grubba Exp $");
#include "pike_macros.h"
#include "object.h"
#include "constants.h"
@@ -1303,7 +1303,7 @@ static void _decode_get_extension(unsigned char **s,
{
if ((*len)-1<sz) sz=(*len)-1;
- push_string(make_shared_binary_string((*s)+1,sz));
+ push_string(make_shared_binary_string((char *)(*s)+1,sz));
n++;
(*len)-=(sz+1);
@@ -1363,7 +1363,7 @@ static void _decode_get_render(unsigned char **s,
if ( ((*s)[9]&128) ) {
if ((*len)>10+(unsigned long)(3<<bpp) )
{
- push_string(make_shared_binary_string((*s)+10,3<<bpp));
+ push_string(make_shared_binary_string((char *)(*s)+10,3<<bpp));
(*s)+=10+(3<<bpp);
(*len)-=10+(3<<bpp);
}
@@ -1388,7 +1388,7 @@ static void _decode_get_render(unsigned char **s,
{
if ((*len)-1<sz) sz=(*len)-1;
- push_string(make_shared_binary_string((*s)+1,sz));
+ push_string(make_shared_binary_string((char *)(*s)+1,sz));
n++;
(*len)-=(sz+1);
@@ -1417,7 +1417,7 @@ static void image_gif___decode(INT32 args)
error("Image.GIF.__decode: illegal or illegal number of arguments\n");
(str=sp[-args].u.string)->refs++;
- s=str->str;
+ s=(unsigned char *)str->str;
len=str->len;
pop_n_elems(args);
@@ -1469,7 +1469,7 @@ static void image_gif___decode(INT32 args)
if (globalpalette)
{
- push_string(make_shared_binary_string(s,3<<bpp));
+ push_string(make_shared_binary_string((char *)s,3<<bpp));
s+=3<<bpp;
len-=3<<bpp;
}
@@ -1517,7 +1517,7 @@ static void image_gif___decode(INT32 args)
case 0x2c: _decode_get_render(&s,&len); n++; break;
case 0x3b:
push_int(GIF_ERROR_TOO_MUCH_DATA);
- push_string(make_shared_binary_string(s+1,len-1));
+ push_string(make_shared_binary_string((char *)s+1,len-1));
f_aggregate(2);
s+=len;
len=0;
@@ -1525,7 +1525,7 @@ static void image_gif___decode(INT32 args)
break;
default:
push_int(GIF_ERROR_UNKNOWN_DATA);
- push_string(make_shared_binary_string(s,len));
+ push_string(make_shared_binary_string((char *)s,len));
f_aggregate(2);
s+=len;
len=0;
@@ -1921,7 +1921,8 @@ static void image_gif__decode(INT32 args)
aimg=(struct image*)get_storage(o2,image_program);
push_object(o2);
if (lcto)
- _gif_decode_lzw(b->item[8].u.string->str, /* lzw string */
+ _gif_decode_lzw((unsigned char *)
+ b->item[8].u.string->str, /* lzw string */
b->item[8].u.string->len, /* lzw len */
b->item[7].u.integer, /* lzw bits */
lcto, /* colortable */
@@ -1934,7 +1935,8 @@ static void image_gif__decode(INT32 args)
{
push_int(0);
if (lcto)
- _gif_decode_lzw(b->item[8].u.string->str, /* lzw string */
+ _gif_decode_lzw((unsigned char *)
+ b->item[8].u.string->str, /* lzw string */
b->item[8].u.string->len, /* lzw len */
b->item[7].u.integer, /* lzw bits */
lcto, /* colortable */
@@ -1978,7 +1980,7 @@ static void image_gif__decode(INT32 args)
{
case 0xf9: /* gce */
if (b->item[2].u.string->len>=4)
- s=b->item[2].u.string->str;
+ s=(unsigned char *)b->item[2].u.string->str;
transparency=s[0]&1;
user_input=!!(s[0]&2);
disposal=(s[0]>>2)&7;
diff --git a/src/modules/files/file.c b/src/modules/files/file.c
index 80f157fe38..ea96e5e793 100644
--- a/src/modules/files/file.c
+++ b/src/modules/files/file.c
@@ -6,7 +6,7 @@
#define READ_BUFFER 8192
#include "global.h"
-RCSID("$Id: file.c,v 1.67 1998/01/21 19:43:52 hubbe Exp $");
+RCSID("$Id: file.c,v 1.68 1998/01/21 23:51:41 grubba Exp $");
#include "fdlib.h"
#include "interpret.h"
#include "svalue.h"
@@ -1456,7 +1456,7 @@ static void file_query_address(INT32 args)
{
struct sockaddr_in addr;
int i;
- size_t len;
+ int len;
char buffer[496],*q;
if(FD <0)
--
GitLab