generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

os_support: K&R formatting cosmetics

Browse Source
This commit is contained in:
Diego Biurrun 2012-07-15 22:12:30 +02:00
parent 453c02f971
commit 7a249625fd
1 changed files with 71 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
libavformat/os_support.c
View File

@ -82,7 +82,8 @@ int ff_inet_aton (const char * str, struct in_addr * add)
if (sscanf(str, "%d.%d.%d.%d", &add1, &add2, &add3, &add4) != 4) if (sscanf(str, "%d.%d.%d.%d", &add1, &add2, &add3, &add4) != 4)
return 0; return 0;
if (!add1 || (add1|add2|add3|add4) > 255) return 0; if (!add1 || (add1 | add2 | add3 | add4) > 255)
return 0;
add->s_addr = htonl((add1 << 24) + (add2 << 16) + (add3 << 8) + add4); add->s_addr = htonl((add1 << 24) + (add2 << 16) + (add3 << 8) + add4);
@ -133,9 +134,9 @@ int ff_getaddrinfo(const char *node, const char *service,
memcpy(&sin->sin_addr, h->h_addr_list[0], sizeof(struct in_addr)); memcpy(&sin->sin_addr, h->h_addr_list[0], sizeof(struct in_addr));
} }
} else { } else {
if (hints && (hints->ai_flags & AI_PASSIVE)) { if (hints && (hints->ai_flags & AI_PASSIVE))
sin->sin_addr.s_addr = INADDR_ANY; sin->sin_addr.s_addr = INADDR_ANY;
} else else
sin->sin_addr.s_addr = INADDR_LOOPBACK; sin->sin_addr.s_addr = INADDR_LOOPBACK;
} }
@ -154,9 +155,15 @@ int ff_getaddrinfo(const char *node, const char *service,
ai->ai_family = AF_INET; ai->ai_family = AF_INET;
ai->ai_socktype = hints ? hints->ai_socktype : 0; ai->ai_socktype = hints ? hints->ai_socktype : 0;
switch (ai->ai_socktype) { switch (ai->ai_socktype) {
case SOCK_STREAM: ai->ai_protocol = IPPROTO_TCP; break; case SOCK_STREAM:
case SOCK_DGRAM: ai->ai_protocol = IPPROTO_UDP; break; ai->ai_protocol = IPPROTO_TCP;
default: ai->ai_protocol = 0; break; break;
case SOCK_DGRAM:
ai->ai_protocol = IPPROTO_UDP;
break;
default:
ai->ai_protocol = 0;
break;
} }
ai->ai_addr = (struct sockaddr *)sin; ai->ai_addr = (struct sockaddr *)sin;
@ -231,9 +238,9 @@ int ff_getnameinfo(const struct sockaddr *sa, int salen,
if (!(flags & NI_NUMERICSERV)) if (!(flags & NI_NUMERICSERV))
ent = getservbyport(sin->sin_port, flags & NI_DGRAM ? "udp" : "tcp"); ent = getservbyport(sin->sin_port, flags & NI_DGRAM ? "udp" : "tcp");
if (ent) { if (ent)
snprintf(serv, servlen, "%s", ent->s_name); snprintf(serv, servlen, "%s", ent->s_name);
} else else
snprintf(serv, servlen, "%d", ntohs(sin->sin_port)); snprintf(serv, servlen, "%d", ntohs(sin->sin_port));
} }
@ -245,17 +252,27 @@ int ff_getnameinfo(const struct sockaddr *sa, int salen,
const char *ff_gai_strerror(int ecode) const char *ff_gai_strerror(int ecode)
{ {
switch (ecode) { switch (ecode) {
case EAI_AGAIN : return "Temporary failure in name resolution"; case EAI_AGAIN:
case EAI_BADFLAGS: return "Invalid flags for ai_flags"; return "Temporary failure in name resolution";
case EAI_FAIL : return "A non-recoverable error occurred"; case EAI_BADFLAGS:
case EAI_FAMILY : return "The address family was not recognized or the address length was invalid for the specified family"; return "Invalid flags for ai_flags";
case EAI_MEMORY : return "Memory allocation failure"; case EAI_FAIL:
return "A non-recoverable error occurred";
case EAI_FAMILY:
return "The address family was not recognized or the address "
"length was invalid for the specified family";
case EAI_MEMORY:
return "Memory allocation failure";
#if EAI_NODATA != EAI_NONAME #if EAI_NODATA != EAI_NONAME
case EAI_NODATA : return "No address associated with hostname"; case EAI_NODATA:
return "No address associated with hostname";
#endif #endif
case EAI_NONAME : return "The name does not resolve for the supplied parameters"; case EAI_NONAME:
case EAI_SERVICE: return "servname not supported for ai_socktype"; return "The name does not resolve for the supplied parameters";
case EAI_SOCKTYPE: return "ai_socktype not supported"; case EAI_SERVICE:
return "servname not supported for ai_socktype";
case EAI_SOCKTYPE:
return "ai_socktype not supported";
} }
return "Unknown error"; return "Unknown error";
@ -307,27 +324,29 @@ int ff_poll(struct pollfd *fds, nfds_t numfds, int timeout)
} }
#endif #endif
if (fds[i].events & POLLIN) FD_SET(fds[i].fd, &read_set); if (fds[i].events & POLLIN)
if (fds[i].events & POLLOUT) FD_SET(fds[i].fd, &write_set); FD_SET(fds[i].fd, &read_set);
if (fds[i].events & POLLERR) FD_SET(fds[i].fd, &exception_set); if (fds[i].events & POLLOUT)
FD_SET(fds[i].fd, &write_set);
if (fds[i].events & POLLERR)
FD_SET(fds[i].fd, &exception_set);
if (fds[i].fd >= n) if (fds[i].fd >= n)
n = fds[i].fd + 1; n = fds[i].fd + 1;
}; }
if (n == 0) if (n == 0)
/* Hey!? Nothing to poll, in fact!!! */ /* Hey!? Nothing to poll, in fact!!! */
return 0; return 0;
if (timeout < 0) if (timeout < 0) {
rc = select(n, &read_set, &write_set, &exception_set, NULL); rc = select(n, &read_set, &write_set, &exception_set, NULL);
else { } else {
struct timeval tv; struct timeval tv;
tv.tv_sec = timeout / 1000; tv.tv_sec = timeout / 1000;
tv.tv_usec = 1000 * (timeout % 1000); tv.tv_usec = 1000 * (timeout % 1000);
rc = select(n, &read_set, &write_set, &exception_set, &tv); rc = select(n, &read_set, &write_set, &exception_set, &tv);
}; }
if (rc < 0) if (rc < 0)
return rc; return rc;
@ -335,10 +354,13 @@ int ff_poll(struct pollfd *fds, nfds_t numfds, int timeout)
for (i = 0; i < numfds; i++) { for (i = 0; i < numfds; i++) {
fds[i].revents = 0; fds[i].revents = 0;
if (FD_ISSET(fds[i].fd, &read_set)) fds[i].revents |= POLLIN; if (FD_ISSET(fds[i].fd, &read_set))
if (FD_ISSET(fds[i].fd, &write_set)) fds[i].revents |= POLLOUT; fds[i].revents |= POLLIN;
if (FD_ISSET(fds[i].fd, &exception_set)) fds[i].revents |= POLLERR; if (FD_ISSET(fds[i].fd, &write_set))
}; fds[i].revents |= POLLOUT;
if (FD_ISSET(fds[i].fd, &exception_set))
fds[i].revents |= POLLERR;
}
return rc; return rc;
} }