shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00
Code

socket: rename ffs_xyz to usbffs_xyz

Browse Source 
The relation to USB should really be clearer.
This commit is contained in:
Lennart Poettering 2015-09-23 20:01:54 +02:00
parent 00411a1343
commit 3607810227
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/socket.c
View File

@ -1054,7 +1054,7 @@ static int special_address_create(const char *path) {
return r; return r;
} }
static int ffs_address_create(const char *path) { static int usbffs_address_create(const char *path) {
_cleanup_close_ int fd = -1; _cleanup_close_ int fd = -1;
struct stat st; struct stat st;
int r; int r;
@ -1142,7 +1142,7 @@ static int socket_symlink(Socket *s) {
return 0; return 0;
} }
static int ffs_write_descs(int fd, Service *s) { static int usbffs_write_descs(int fd, Service *s) {
int r; int r;
if (!s->usb_function_descriptors || !s->usb_function_strings) if (!s->usb_function_descriptors || !s->usb_function_strings)
@ -1155,20 +1155,20 @@ static int ffs_write_descs(int fd, Service *s) {
return copy_file_fd(s->usb_function_strings, fd, false); return copy_file_fd(s->usb_function_strings, fd, false);
} }
static int select_ep(const struct dirent *d) { static int usbffs_select_ep(const struct dirent *d) {
return d->d_name[0] != '.' && !streq(d->d_name, "ep0"); return d->d_name[0] != '.' && !streq(d->d_name, "ep0");
} }
static int ffs_dispatch_eps(SocketPort *p) { static int usbffs_dispatch_eps(SocketPort *p) {
_cleanup_free_ struct dirent **ent = NULL; _cleanup_free_ struct dirent **ent = NULL;
int r, i, n, k;
_cleanup_free_ char *path = NULL; _cleanup_free_ char *path = NULL;
int r, i, n, k;
r = path_get_parent(p->path, &path); r = path_get_parent(p->path, &path);
if (r < 0) if (r < 0)
return r; return r;
r = scandir(path, &ent, select_ep, alphasort); r = scandir(path, &ent, usbffs_select_ep, alphasort);
if (r < 0) if (r < 0)
return -errno; return -errno;
@ -1189,7 +1189,7 @@ static int ffs_dispatch_eps(SocketPort *p) {
path_kill_slashes(ep); path_kill_slashes(ep);
r = ffs_address_create(ep); r = usbffs_address_create(ep);
if (r < 0) if (r < 0)
goto fail; goto fail;
@ -1316,17 +1316,17 @@ static int socket_open_fds(Socket *s) {
case SOCKET_USB_FUNCTION: case SOCKET_USB_FUNCTION:
p->fd = ffs_address_create(p->path); p->fd = usbffs_address_create(p->path);
if (p->fd < 0) { if (p->fd < 0) {
r = p->fd; r = p->fd;
goto rollback; goto rollback;
} }
r = ffs_write_descs(p->fd, SERVICE(UNIT_DEREF(s->service))); r = usbffs_write_descs(p->fd, SERVICE(UNIT_DEREF(s->service)));
if (r < 0) if (r < 0)
goto rollback; goto rollback;
r = ffs_dispatch_eps(p); r = usbffs_dispatch_eps(p);
if (r < 0) if (r < 0)
goto rollback; goto rollback;