Rename bstrlib function bgets because theres already one in libgen.sh

diff --git a/include/atalk/bstrlib.h b/include/atalk/bstrlib.h
index 858a3fabadfbfe85ce378f8504251a64d8b071d1..0cd371971c200391bc4d046486bc920e4ccb13fa 100644 (file)
--- a/include/atalk/bstrlib.h
+++ b/include/atalk/bstrlib.h
@@ -159,7 +159,7 @@ typedef int (*bNgetc) (void *parm);
 typedef size_t (* bNread) (void *buff, size_t elsize, size_t nelem, void *parm);
 
 /* Input functions */
-extern bstring bgets (bNgetc getcPtr, void * parm, char terminator);
+extern bstring bgetstream (bNgetc getcPtr, void * parm, char terminator);
 extern bstring bread (bNread readPtr, void * parm);
 extern int bgetsa (bstring b, bNgetc getcPtr, void * parm, char terminator);
 extern int bassigngets (bstring b, bNgetc getcPtr, void * parm, char terminator);

diff --git a/libatalk/bstring/bstradd.c b/libatalk/bstring/bstradd.c
index 9f617ebcfdca41d572a266c3379c78a40cebfa00..749c963f89b36cc017eb90b5b9782c354f8b6dd9 100644 (file)
--- a/libatalk/bstring/bstradd.c
+++ b/libatalk/bstring/bstradd.c
@@ -75,7 +75,7 @@
  * This is usefull if a well know code path uses string, often doing strlen on string.
  * By converting to bstring which carries the strlen, the repeated computation can be avoided.
  */
-bstring brefcstr (const char *str) {
+bstring brefcstr (char *str) {
     bstring b;
     int i;
     size_t j;

diff --git a/libatalk/bstring/bstrlib.c b/libatalk/bstring/bstrlib.c
index 9748c00252f14cba496eb634adec38584bc0c7e2..29e113e3751ad79da7a7dbae2d4d3e9565019582 100644 (file)
--- a/libatalk/bstring/bstrlib.c
+++ b/libatalk/bstring/bstrlib.c
@@ -1869,7 +1869,7 @@ int c, d, e;
        return d == 0 && c < 0;
 }
 
-/*  bstring bgets (bNgetc getcPtr, void * parm, char terminator)
+/*  bstring bgetstream (bNgetc getcPtr, void * parm, char terminator)
  *
  *  Use an fgetc-like single character stream reading function (getcPtr) to 
  *  obtain a sequence of characters which are concatenated into a bstring.  
@@ -1880,7 +1880,7 @@ int c, d, e;
  *  result obtained thus far is returned.  If no characters are read, or 
  *  there is some other detectable error, NULL is returned.
  */
-bstring bgets (bNgetc getcPtr, void * parm, char terminator) {
+bstring bgetstream (bNgetc getcPtr, void * parm, char terminator) {
 bstring buff;
 
        if (0 > bgetsa (buff = bfromcstr (""), getcPtr, parm, terminator) || 0 >= buff->slen) {