← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/blender/intrepid-updates

« back to all changes in this revision

Viewing changes to source/blender/blenkernel/intern/writeframeserver.c

  • Committer: Bazaar Package Importer
  • Author(s): Cyril Brulebois
  • Date: 2008-08-08 02:45:40 UTC
  • mfrom: (12.1.14 intrepid)
  • Revision ID: james.westby@ubuntu.com-20080808024540-kkjp7ekfivzhuw3l
Tags: 2.46+dfsg-4
http://bugs.debian.org/492280
* Fix python syntax warning in import_dxf.py, which led to nasty output
  in installation/upgrade logs during byte-compilation, using a patch
  provided by the script author (Closes: #492280):
   - debian/patches/45_fix_python_syntax_warning

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/blenkernel/intern/writeframeserver.c
256
256
        fd_set readfds;
257
257
        struct timeval tv;
258
258
        struct sockaddr_in      addr;
259
 
        int len;
 
259
        int len, rval;
 
260
        unsigned int socklen;
260
261
        char buf[4096];
261
 
        int rval;
262
262
 
263
263
        if (connsock != -1) {
264
264
                closesocket(connsock);
280
280
                return -1;
281
281
        }
282
282
 
283
 
        len = sizeof(addr);
 
283
        socklen = sizeof(addr);
284
284
 
285
 
        if ((connsock = accept(sock, (struct sockaddr *)&addr, &len)) < 0) {
 
285
        if ((connsock = accept(sock, (struct sockaddr *)&addr, &socklen)) < 0) {
286
286
                return -1;
287
287
        }
288
288
 
350
350
                        target += 3;
351
351
                        src += 4;
352
352
                }
353
 
                safe_write(row, 3 * rectx); 
 
353
                safe_write((char*)row, 3 * rectx); 
354
354
        }
355
355
        free(row);
356
356
        closesocket(connsock);