[FFmpeg-devel] FFServer Cygwin Port Fix

[Diego Biurrun]

On Wed, Dec 16, 2009 at 02:18:45PM +0500, Imran Moinuddin wrote:
> This is my first patch submission so hope I haven't botched anything :)

You have.

> --- C:/trash/ffmpeg/ffmpeg/ffserver_orig.c	Wed Dec 16 10:25:10 2009
> +++ C:/trash/ffmpeg/ffmpeg/ffserver.c	Wed Dec 16 14:11:04 2009
> @@ -473,19 +474,25 @@
>  
> -    if (bind (server_fd, (struct sockaddr *) my_addr, sizeof (*my_addr)) < 0) {
> -        char bindmsg[32];
> -        snprintf(bindmsg, sizeof(bindmsg), "bind(port %d)", ntohs(my_addr->sin_port));
> -        perror (bindmsg);
> -        closesocket(server_fd);
> -        return -1;
> +    if (bind(server_fd, (struct sockaddr *) &serv_addr,
> +          sizeof(serv_addr)) < 0)  {
> +          char bindmsg[32];
> +          snprintf(bindmsg, sizeof(bindmsg), "bind(port %d)", ntohs(my_addr->sin_port));
> +          perror (bindmsg);
> +          closesocket(server_fd);
> +          return -1;

This was correctly indented before, now it no longer is.  Why did you
touch it in the first place?

>      }
> -
> +    
>      if (listen (server_fd, 5) < 0) {

cosmetics

>          perror ("listen");
>          closesocket(server_fd);
>          return -1;
>      }
> +    
>      ff_socket_nonblock(server_fd, 1);

ditto

Diego