Skip to content

Commit

Permalink
[nozzle] cleanup and document nozzle_get_handle_by_name
Browse files Browse the repository at this point in the history
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
  • Loading branch information
fabbione committed Aug 3, 2018
1 parent 340511b commit 44d7c8e
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 14 deletions.
26 changes: 13 additions & 13 deletions libnozzle/libnozzle.c
Expand Up @@ -363,35 +363,35 @@ static int _get_mac(const nozzle_t nozzle, char **ether_addr)
return err;
}

nozzle_t nozzle_find(char *dev, size_t dev_size)
nozzle_t nozzle_get_handle_by_name(char *devname)
{
int savederrno = 0;
nozzle_t nozzle;

if (dev == NULL) {
errno = EINVAL;
return NULL;
}

if (dev_size < IFNAMSIZ) {
if ((devname == NULL) || (strlen(devname) > IFNAMSIZ)) {
errno = EINVAL;
return NULL;
}

if (strlen(dev) > IFNAMSIZ) {
errno = E2BIG;
savederrno = pthread_mutex_lock(&lib_mutex);
if (savederrno) {
errno = savederrno;
return NULL;
}

pthread_mutex_lock(&lib_mutex);

nozzle = lib_cfg.head;
while (nozzle != NULL) {
if (!strcmp(dev, nozzle->nozzlename))
if (!strcmp(devname, nozzle->nozzlename))
break;
nozzle = nozzle->next;
}

if (!nozzle) {
savederrno = ENOENT;
}

pthread_mutex_unlock(&lib_mutex);
errno = savederrno;
return nozzle;
}

Expand Down Expand Up @@ -1348,7 +1348,7 @@ static int test_iface(char *name, size_t size, const char *updownpath)
printf("Unable to find interface %s on the system\n", name);
}

if (!nozzle_find(name, size)) {
if (!nozzle_get_handle_by_name(name)) {
printf("Unable to find interface %s in nozzle db\n", name);
} else {
printf("Found interface %s in nozzle db\n", name);
Expand Down
14 changes: 13 additions & 1 deletion libnozzle/libnozzle.h
Expand Up @@ -290,7 +290,19 @@ int nozzle_set_mac(nozzle_t nozzle, const char *ether_addr);

int nozzle_reset_mac(nozzle_t nozzle);

nozzle_t nozzle_find(char *dev, size_t dev_size);
/**
* nozzle_get_handle_by_name
* @brief fine a nozzle handle by device name
*
* devname - string containing the name of the interface
*
* @return
* handle on success.
* NULL on error and errno is set.
*/

nozzle_t nozzle_get_handle_by_name(char *devname);

int nozzle_get_fd(const nozzle_t nozzle);
const char *nozzle_get_name(const nozzle_t nozzle);

Expand Down

0 comments on commit 44d7c8e

Please sign in to comment.