comparison input/input.c @ 36153:affa86541a51

Avoid dead code and a memleak.

36152:c3b4a1b48c7d

  memmove(dst, src, strlen(src) + 1);
}

static int
mp_input_parse_config(char *file) {
  int fd;
  int eof = 0,comments = 0;
  char *iter,*end;
  char buffer[BS_MAX];
  int n_binds = 0, keys[MP_MAX_KEY_DOWN+1] = { 0 };

      buffer[bs] = 0;
      if(r < 0) {
	if(errno == EINTR)
	  continue;
	mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrReadingInputConfig,file,strerror(errno));
	close(fd);
	return 0;
      }
      eof = r == 0;
    }
    // Empty buffer : return
    if(!buffer[0]) {
      mp_msg(MSGT_INPUT,MSGL_V,"Input config file %s parsed: %d binds\n",file,n_binds);
      close(fd);
      return 1;
    }

    iter = buffer;

    if(comments) {

      for(end = iter; end[0] && strchr(SPACE_CHAR,end[0]) == NULL ; end++)
	/*NOTHING */;
      if(!end[0]) { // Key name doesn't fit in the buffer
	if(buffer == iter) {
	  mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrBuffer2SmallForKeyName,iter);
	  return 0;
	}
	strmove(buffer,iter);
	continue;
      }
	end[0] = 0;
	if(! mp_input_get_input_from_name(iter,keys)) {
	  mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrUnknownKey,iter);
	  close(fd);
	  return 0;
	}
      strmove(buffer,end+1);
      continue;
    } else { // Get the command
      while(iter[0] == ' ' || iter[0] == '\t') iter++;

      for(end = iter ; end[0] != '\n' && end[0] != '\r' && end[0] ; end++)
	/* NOTHING */;
      if(!end[0]) {
	if(iter == buffer) {
	  mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrBuffer2SmallForCmd,buffer);
	  close(fd);
	  return 0;
	}
	strmove(buffer,iter);
	continue;
      }
	end[0] = 0;

      keys[0] = 0;
      strmove(buffer,end+1);
      continue;
    }
  }
  mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrWhyHere);
  close(fd);
  mp_input_set_section(NULL);
  return 0;
}

void
mp_input_set_section(char *name) {
  mp_cmd_bind_section_t* bind_section = NULL;

36153:affa86541a51

  memmove(dst, src, strlen(src) + 1);
}

static int
mp_input_parse_config(char *file) {
  int res = 0;
  int fd;
  int eof = 0,comments = 0;
  char *iter,*end;
  char buffer[BS_MAX];
  int n_binds = 0, keys[MP_MAX_KEY_DOWN+1] = { 0 };

      buffer[bs] = 0;
      if(r < 0) {
	if(errno == EINTR)
	  continue;
	mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrReadingInputConfig,file,strerror(errno));
	break;
      }
      eof = r == 0;
    }
    // Empty buffer : return
    if(!buffer[0]) {
      mp_msg(MSGT_INPUT,MSGL_V,"Input config file %s parsed: %d binds\n",file,n_binds);
      res = 1;
      break;
    }

    iter = buffer;

    if(comments) {

      for(end = iter; end[0] && strchr(SPACE_CHAR,end[0]) == NULL ; end++)
	/*NOTHING */;
      if(!end[0]) { // Key name doesn't fit in the buffer
	if(buffer == iter) {
	  mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrBuffer2SmallForKeyName,iter);
	  break;
	}
	strmove(buffer,iter);
	continue;
      }
	end[0] = 0;
	if(! mp_input_get_input_from_name(iter,keys)) {
	  mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrUnknownKey,iter);
	  break;
	}
      strmove(buffer,end+1);
      continue;
    } else { // Get the command
      while(iter[0] == ' ' || iter[0] == '\t') iter++;

      for(end = iter ; end[0] != '\n' && end[0] != '\r' && end[0] ; end++)
	/* NOTHING */;
      if(!end[0]) {
	if(iter == buffer) {
	  mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrBuffer2SmallForCmd,buffer);
	  break;
	}
	strmove(buffer,iter);
	continue;
      }
	end[0] = 0;

      keys[0] = 0;
      strmove(buffer,end+1);
      continue;
    }
  }
  close(fd);
  return res;
}

void
mp_input_set_section(char *name) {
  mp_cmd_bind_section_t* bind_section = NULL;