[or-cvs] parse_line_from_file is obsolete.

[Roger Dingledine]

Update of /home/or/cvsroot/src/common
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/common

Modified Files:
	container.c util.c util.h 
Log Message:
parse_line_from_file is obsolete.


Index: container.c
===================================================================
RCS file: /home/or/cvsroot/src/common/container.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- container.c	3 Nov 2004 18:28:00 -0000	1.3
+++ container.c	6 Nov 2004 05:18:29 -0000	1.4
@@ -313,7 +313,7 @@
 
 /** As smartlist_join_strings2, but instead of separating/terminated with a
  * NUL-terminated string <b>join</b>, uses the <b>join_len</b>-byte sequence
- * at <b>join</b>.  (Useful for generating a sequenct of NUL-terminated
+ * at <b>join</b>.  (Useful for generating a sequence of NUL-terminated
  * strings.)
  */
 char *smartlist_join_strings2(smartlist_t *sl, const char *join,

Index: util.c
===================================================================
RCS file: /home/or/cvsroot/src/common/util.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- util.c	5 Nov 2004 17:54:50 -0000	1.169
+++ util.c	6 Nov 2004 05:18:29 -0000	1.170
@@ -871,77 +871,6 @@
   return string;
 }
 
-/** read lines from f (no more than maxlen-1 bytes each) until we
- * get a non-whitespace line. If it isn't of the form "key value"
- * (value can have spaces), return -1.
- * Point *key to the first word in line, point *value * to the second.
- * Put a \0 at the end of key, remove everything at the end of value
- * that is whitespace or comment.
- * Return 1 if success, 0 if no more lines, -1 if error.
- */
-int
-parse_line_from_file(char *line, size_t maxlen, FILE *f,
-                     char **key_out, char **value_out) {
-  char *s;
-
-try_next_line:
-  if(!fgets(line, maxlen, f)) {
-    if(feof(f))
-      return 0;
-    return -1; /* real error */
-  }
-  line[maxlen-1] = '\0';
-
-  s = parse_line_from_str(line, key_out, value_out);
-  if (!s)
-    return -1;
-  if (!*key_out)
-    goto try_next_line;
-
-  return 1;
-
-#if 0
-
-  if((s = strchr(line,'#'))) /* strip comments */
-    *s = 0; /* stop the line there */
-
-  /* remove end whitespace */
-  s = strchr(line, 0); /* now we're at the null */
-  do {
-    *s = 0;
-    s--;
-  } while (s >= line && isspace((int)*s));
-
-  key = line;
-  while(isspace((int)*key))
-    key++;
-  if(*key == 0)
-    goto try_next_line; /* this line has nothing on it */
-  end = key;
-  while(*end && !isspace((int)*end))
-    end++;
-  value = end;
-  while(*value && isspace((int)*value))
-    value++;
-
-#if 0
-  if(!*end || !*value) { /* only a key on this line. no value. */
-    *end = 0;
-    log_fn(LOG_WARN,"Line has keyword '%s' but no value. Failing.",key);
-    return -1;
-  }
-#endif
-  *end = 0; /* null it out */
-
-  tor_assert(key);
-  tor_assert(value);
-  log_fn(LOG_DEBUG,"got keyword '%s', value '%s'", key, value);
-  *key_out = key, *value_out = value;
-  return 1;
-#endif
-}
-
-
 /** DOCDOC.
  *
  * Return next line or end of string on success, NULL on failure.
@@ -1149,7 +1078,7 @@
     tor_free(_address);
   }
   if (port)
-    *port =  ok ? ((uint16_t) _port) : 0;
+    *port = ok ? ((uint16_t) _port) : 0;
 
   return ok ? 0 : -1;
 }

Index: util.h
===================================================================
RCS file: /home/or/cvsroot/src/common/util.h,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- util.h	5 Nov 2004 17:54:50 -0000	1.115
+++ util.h	6 Nov 2004 05:18:29 -0000	1.116
@@ -93,7 +93,6 @@
 int write_bytes_to_file(const char *fname, const char *str, size_t len,
                         int bin);
 char *read_file_to_str(const char *filename, int bin);
-int parse_line_from_file(char *line, size_t maxlen, FILE *f, char **key_out, char **value_out);
 char *parse_line_from_str(char *line, char **key_out, char **value_out);
 char *expand_filename(const char *filename);