Changeset 204 for branches/samba-3.2.x/source/client/mount.cifs.c

Timestamp:

May 20, 2009, 6:46:53 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.4

File:

• branches/samba-3.2.x/source/client/mount.cifs.c (modified) (4 diffs)

branches/samba-3.2.x/source/client/mount.cifs.c

@@ -95 +95 @@
 /* like strncpy but does not 0 fill the buffer and always null
  *    terminates. bufsize is the size of the destination buffer */
-size_t strlcpy(char *d, const char *s, size_t bufsize)
+static size_t strlcpy(char *d, const char *s, size_t bufsize)
 {
         size_t len = strlen(s);
@@ -109 +109 @@
  *    terminates. bufsize is the length of the buffer, which should
  *       be one more than the maximum resulting string length */
-size_t strlcat(char *d, const char *s, size_t bufsize)
+static size_t strlcat(char *d, const char *s, size_t bufsize)
 {
         size_t len1 = strlen(d);
@@ -197 +197 @@
         if(line_buf == NULL) {
                 fclose(fs);
-                return -ENOMEM;
+                return ENOMEM;
         }
 
@@ -534 +534 @@
                                 rc = open_cred_file(value);
                                 if(rc) {
-                                        printf("error %d opening credential file %s\n",rc, value);
+                                        printf("error %d (%s) opening credential file %s\n",
+                                                rc, strerror(rc), value);
                                         return 1;
                                 }