The R Project SVN R

Rev

Rev 69907 | Rev 77803 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 69907 Rev 70996
Line 177... Line 177...
177 
    if(!new) error(_("allocation of socket connection failed"));
 177 
    if(!new) error(_("allocation of socket connection failed"));
178 
    new->class = (char *) malloc(strlen("sockconn") + 1);
 178 
    new->class = (char *) malloc(strlen("sockconn") + 1);
179 
    if(!new->class) {
 179 
    if(!new->class) {
180 
	free(new);
 180 
	free(new);
181 
	error(_("allocation of socket connection failed"));
 181 
	error(_("allocation of socket connection failed"));
- 
 
 182 
        /* for Solaris 12.5 */ new = NULL;
182 
    }
 183 
    }
183 
    strcpy(new->class, "sockconn");
 184 
    strcpy(new->class, "sockconn");
184 
    new->description = (char *) malloc(strlen(host) + 10);
 185 
    new->description = (char *) malloc(strlen(host) + 10);
185 
    if(!new->description) {
 186 
    if(!new->description) {
186 
	free(new->class); free(new);
 187 
	free(new->class); free(new);
187 
	error(_("allocation of socket connection failed"));
 188 
	error(_("allocation of socket connection failed"));
- 
 
 189 
        /* for Solaris 12.5 */ new = NULL;
188 
    }
 190 
    }
189 
    init_con(new, host, CE_NATIVE, mode);
 191 
    init_con(new, host, CE_NATIVE, mode);
190 
    new->open = &sock_open;
 192 
    new->open = &sock_open;
191 
    new->close = &sock_close;
 193 
    new->close = &sock_close;
192 
    new->vfprintf = &dummy_vfprintf;
 194 
    new->vfprintf = &dummy_vfprintf;
Line 196... Line 198...
196 
    new->write = &sock_write;
 198 
    new->write = &sock_write;
197 
    new->private = (void *) malloc(sizeof(struct sockconn));
 199 
    new->private = (void *) malloc(sizeof(struct sockconn));
198 
    if(!new->private) {
 200 
    if(!new->private) {
199 
	free(new->description); free(new->class); free(new);
 201 
	free(new->description); free(new->class); free(new);
200 
	error(_("allocation of socket connection failed"));
 202 
	error(_("allocation of socket connection failed"));
- 
 
 203 
	/* for Solaris 12.5 */ new = NULL;
201 
    }
 204 
    }
202 
    ((Rsockconn)new->private)-> port = port;
 205 
    ((Rsockconn)new->private)-> port = port;
203 
    ((Rsockconn)new->private)-> server = server;
 206 
    ((Rsockconn)new->private)-> server = server;
204 
    ((Rsockconn)new->private)-> timeout = timeout;
 207 
    ((Rsockconn)new->private)-> timeout = timeout;
205 
    return new;
 208 
    return new;