[Cluster-devel] cluster/ccs/ccs_tool update.c
fabbione at sourceware.org
fabbione at sourceware.org
Thu May 3 09:25:57 UTC 2007
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione at sourceware.org 2007-05-03 09:25:57
Modified files:
ccs/ccs_tool : update.c
Log message:
Remove dead code
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_tool/update.c.diff?cvsroot=cluster&r1=1.11&r2=1.12
--- cluster/ccs/ccs_tool/update.c 2007/05/03 09:06:39 1.11
+++ cluster/ccs/ccs_tool/update.c 2007/05/03 09:25:57 1.12
@@ -35,16 +35,10 @@
static member_list_t *get_member_list(cman_handle_t handle);
static void free_member_list(member_list_t *list);
-static char *member_id_to_name(member_list_t *list, int node);
-static int member_name_to_id(member_list_t *list, char *name);
-static int member_addr_to_id(member_list_t *list, struct sockaddr *addr);
-static int member_online_node(member_list_t *list, int node);
-static int member_online_name(member_list_t *list, char *name);
static int select_retry(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *xfds,
struct timeval *timeout);
-static ssize_t write_retry(int fd, void *buf, int count, struct timeval *timeout);
static ssize_t read_retry(int fd, void *buf, int count, struct timeval *timeout);
static int ccs_open(cman_node_t node, uint16_t baseport, int timeout);
@@ -447,78 +441,6 @@
}
-static char *member_id_to_name(member_list_t *list, int node)
-{
- int i;
-
- for (i = 0; i < list->count; i++) {
- if (list->nodes[i].cn_nodeid == node) {
- return list->nodes[i].cn_name;
- }
- }
-
- return NULL;
-}
-
-
-static int member_name_to_id(member_list_t *list, char *name)
-{
- int i;
-
- for (i = 0; i < list->count; i++) {
- if (!strcasecmp(list->nodes[i].cn_name, name)) {
- return list->nodes[i].cn_nodeid;
- }
- }
-
- return 0;
-}
-
-
-static int member_addr_to_id(member_list_t *list, struct sockaddr *addr)
-{
- int i;
-
- for (i = 0; i < list->count; i++) {
- if (memcmp(&list->nodes[i].cn_address.cna_address, addr,
- sizeof(struct sockaddr))) {
-
- return list->nodes[i].cn_nodeid;
- }
- }
-
- return -1;
-}
-
-
-static int member_online_node(member_list_t *list, int node)
-{
- int i;
-
- for (i = 0; i < list->count; i++) {
- if (list->nodes[i].cn_nodeid == node) {
- return list->nodes[i].cn_member;
- }
- }
-
- return 0;
-}
-
-
-static int member_online_name(member_list_t *list, char *name)
-{
- int i;
-
- for (i = 0; i < list->count; i++) {
- if (!strcasecmp(list->nodes[i].cn_name, name)) {
- return list->nodes[i].cn_member;
- }
- }
-
- return 0;
-}
-
-
static int select_retry(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *xfds,
struct timeval *timeout)
{
@@ -535,68 +457,6 @@
}
-static ssize_t write_retry(int fd, void *buf, int count, struct timeval *timeout)
-{
- int n, total = 0, remain = count, rv = 0;
- fd_set wfds, xfds;
-
- while (total < count)
- {
- /* Create the write FD set of 1... */
- FD_ZERO(&wfds);
- FD_SET(fd, &wfds);
- FD_ZERO(&xfds);
- FD_SET(fd, &xfds);
-
- /* wait for the fd to be available for writing */
- rv = select_retry(fd + 1, NULL, &wfds, &xfds, timeout);
- if (rv == -1) {
- return -1;
- }
- else if (rv == 0) {
- errno = ETIMEDOUT;
- return -1;
- }
-
- if (FD_ISSET(fd, &xfds)) {
- errno = EPIPE;
- return -1;
- }
-
- /*
- * Attempt to write to fd
- */
- n = write(fd, buf + (off_t) total, remain);
-
- /*
- * When we know our fd was select()ed and we receive 0 bytes
- * when we write, the fd was closed.
- */
- if ((n == 0) && (rv == 1)) {
- errno = EPIPE;
- return -1;
- }
-
- if (n == -1) {
- if ((errno == EAGAIN) || (errno == EINTR)) {
- /*
- * Not ready?
- */
- continue;
- }
-
- /* Other errors: EIO, EINVAL, etc */
- return -1;
- }
-
- total += n;
- remain -= n;
- }
-
- return total;
-}
-
-
static ssize_t read_retry(int fd, void *buf, int count, struct timeval *timeout)
{
int n, total = 0, remain = count, rv = 0;
More information about the Cluster-devel
mailing list