Changeset 988 for vendor/current/examples/libsmbclient/testbrowse2.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/examples/libsmbclient/testbrowse2.c (modified) (6 diffs)

vendor/current/examples/libsmbclient/testbrowse2.c

@@ -6 +6 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <malloc.h>
 #include <string.h>
 #include <libsmbclient.h>
 
 int     debuglevel      = 0;
-char    *workgroup      = "NT";
-char    *username       = "guest";
-char    *password       = "";
+const char      *workgroup      = "NT";
+const char      *username       = "guest";
+const char      *password       = "";
 
 typedef struct smbitem smbitem;
@@ -24 +23 @@
 };
 
-int smbitem_cmp(smbitem *elem1, smbitem *elem2){
-    return strcmp(elem1->name, elem2->name);
-}
-
-int smbitem_list_count(smbitem *list){
-    int count = 0;
-    
-    while(list != NULL){
-        list = list->next;
-        count++;
-    }
-    return count;
-}
-
-void smbitem_list_delete(smbitem *list){
-    smbitem     *elem;
-    
-    while(list != NULL){
-        elem = list;
-        list = list->next;
-        free(elem);
-    }
-}
-
-smbitem* smbitem_list_sort(smbitem *list){
-    smbitem     *item, **array;
-    int         count, i;
-
-    if ((count = smbitem_list_count(list)) == 0) return NULL;
-    if ((array = malloc(count * sizeof(smbitem*))) == NULL){
-        smbitem_list_delete(list);
-        return NULL;
-    }
-    
-    for(i = 0; i < count; i++){
-        array[i] = list;
-        list = list->next;
-    }   
-    qsort(array, count, sizeof(smbitem*), (qsort_cmp)smbitem_cmp);
-    
-    for(i = 0; i < count - 1; i++) array[i]->next = array[i + 1];
-    array[count - 1]->next = NULL;
-    
-    list = array[0];
-    free(array);
-    return list;
-}
-
-void smbc_auth_fn(
+static void smbc_auth_fn(
                 const char      *server,
                 const char      *share,
@@ -89 +40 @@
 }
 
-SMBCCTX* create_smbctx(){
+static SMBCCTX* create_smbctx(void){
     SMBCCTX     *ctx;
 
@@ -105 +56 @@
 }
 
-void delete_smbctx(SMBCCTX* ctx){
+static void delete_smbctx(SMBCCTX* ctx){
     smbc_getFunctionPurgeCachedServers(ctx)(ctx);
     smbc_free_context(ctx, 1);
 }
 
-smbitem* get_smbitem_list(SMBCCTX *ctx, char *smb_path){
+static smbitem* get_smbitem_list(SMBCCTX *ctx, char *smb_path){
     SMBCFILE            *fd;
     struct smbc_dirent  *dirent;
@@ -135 +86 @@
 }
 
-void print_smb_path(char *group, char *path){
+static void print_smb_path(const char *group, const char *path){
     if ((strlen(group) == 0) && (strlen(path) == 0)) printf("/\n");
     else if (strlen(path) == 0) printf("/%s\n", group);
@@ -144 +95 @@
 }
 
-void recurse(SMBCCTX *ctx, char *smb_group, char *smb_path, int maxlen){
+static void recurse(SMBCCTX *ctx, const char *smb_group, char *smb_path, int maxlen){
     int         len;
     smbitem     *list, *item;