Update copyright

Fixed memory leak on shutdown (Affects the embedded version & MyODBC)

5 files changed, 28 insertions, 34 deletions

diff --git a/fs/database.c b/fs/database.c
index 2e93f87376a..4a328c41618 100644
--- a/fs/database.c
+++ b/fs/database.c
@@ -110,7 +110,7 @@ void db_show_result(MYSQL* sock, char *b, struct format *f)
 
    buffptr=b;
    OUTPUT(f->tablestart)
-   
+
    OUTPUT_TOP(f->leftuppercorner);
    OUTPUT_MIDDLE(f->leftcross);
    OUTPUT_BOTTOM(f->leftdowncorner);
@@ -136,7 +136,7 @@ void db_show_result(MYSQL* sock, char *b, struct format *f)
 
       sprintf(hdrptr,"%-*s",field->max_length,field->name);
       //num_flag[off]= IS_NUM(field->type);
-      
+
       topptr+=field->max_length;
       midptr+=field->max_length;
       botptr+=field->max_length;
@@ -161,7 +161,7 @@ void db_show_result(MYSQL* sock, char *b, struct format *f)
    OUTPUT(middleseparator);
    while(row=mysql_fetch_row(result)) {
       mysql_field_seek(result,0);
-           
+
       OUTPUT(f->contentrowstart);
       for(i=0 ; i < mysql_field_count(sock); ++i) {
          field = mysql_fetch_field(result);
@@ -242,7 +242,7 @@ int db_show_field(char *b,const char *database,const char *table, const char *fi
    /* We cant output fields when one of these variables is missing */
    if (!(database[0] && table[0] && field[0]))
       DBUG_RETURN(-1);
-   
+
    init_dynamic_array(&field_array, sizeof(buff), 4096, 1024);
 
    if (mysql_select_db(sock,database))
@@ -459,7 +459,7 @@ db_show_databases(char *b,int size)
    MYSQL_ROW  row;
    char buff[BUFLEN];
    int i=0;
-    
+
    DBUG_ENTER("db_show_databases");
    DBUG_PRINT("enter",("buffer: '%s', size: '%d'", b, size));
    result=mysql_list_dbs(sock,NULL);
@@ -481,7 +481,7 @@ void db_load_formats()
 
    /* HTML output */
    HTML.tablestart="<table>\n";     
-      
+
    HTML.headerrowstart="<tr>";       
    HTML.headercellstart="<th>";
    HTML.headercellseparator="</th><th>";
@@ -499,7 +499,7 @@ void db_load_formats()
    HTML.leftcross="";
    HTML.rightcross="";
    HTML.bottomcross="";
-  
+
    HTML.contentrowstart="<tr>";
    HTML.contentcellstart="<td>";
    HTML.contentcellseparator="</td><td>";
@@ -517,16 +517,16 @@ void db_load_formats()
    HTML.tableend="</table>\n";
 
 /* Nice to look mysql client like output */
-   
+
    Human.tablestart="\n";
-      
+
    Human.headerrowstart="| ";       
    Human.headercellstart="";
    Human.headercellseparator=" | ";
    Human.headercellend=" |";
    Human.headerrowend="\n";
    Human.headerformat=1;
-      
+
    Human.leftuppercorner="/=";
    Human.rightuppercorner="=\\\n";
    Human.leftdowncorner="\\=";
@@ -554,9 +554,9 @@ void db_load_formats()
    Human.tableend="\n";
 
 /* Comma-separated format. For machine reading */
-  
+
    /* XML */
-   
+
 /*
   tee_fprintf(PAGER,"<?xml version=\"1.0\"?>\n\n<resultset statement=\"%s\">", statement);
     (void) tee_fputs("\n  <row>\n", PAGER);
@@ -626,4 +626,3 @@ gptr db_load_functions()
    }
    DBUG_RETURN((gptr)&functions_array);
 }
-
diff --git a/fs/libmysqlfs.c b/fs/libmysqlfs.c
index 856692d0bd1..fde325c3c42 100644
--- a/fs/libmysqlfs.c
+++ b/fs/libmysqlfs.c
@@ -141,7 +141,7 @@ int parse(const char * path, char *server, char * database, char *table,
       if(*funce) *server='\0';
    } else
       *funce=NULL;
-   
+
    DBUG_PRINT("info",("path: '%s', server: '%s', db: '%s', table: '%s', field: '%s', value: '%s', function: '%x'",
                    buffer, server, database, table, field, value, funce )); 
    if(p && *p) /* Something is in buffer - too deep in levels */
@@ -149,5 +149,3 @@ int parse(const char * path, char *server, char * database, char *table,
    else
      DBUG_RETURN(0)
 }
-
-
diff --git a/fs/mysqlcorbafs.c b/fs/mysqlcorbafs.c
index 70db96f64a9..8943c00ed25 100644
--- a/fs/mysqlcorbafs.c
+++ b/fs/mysqlcorbafs.c
@@ -56,7 +56,7 @@ static my_bool  verbose=0,opt_compress=0,extended_insert=0, lock_tables=0,
     opt_quoted=0, opt_lock=0, opt_delayed=0, ignore_errors=0;
 
 gptr fptr;
-    
+
 static const char *load_default_groups[]= { "mysqlcorbafs","client",0 };
 static char *default_charset, *current_host, *current_user, *opt_password,
     *path,*fields_terminated=0, *lines_terminated=0, *enclosed=0, 
@@ -314,7 +314,7 @@ char *field_escape(char *to,const char *from,uint length)
   const char *end;
   uint end_backslashes=0;
   DBUG_ENTER("field_escape");
- 
+
   {
     *to++= *from;
     if (*from == '\\')
@@ -442,7 +442,7 @@ static int get_options(int *argc,char ***argv)
     case OPT_CHARSETS_DIR:
       charsets_dir= optarg;
       break;
-      
+
       ignore_errors=1;
       break;
     case 'h':
@@ -652,7 +652,7 @@ impl_Inode_getStatus(impl_POA_CorbaFS_Inode * servant,
       key[BUFLEN],
       field[BUFLEN],
       value[BUFLEN];
-            
+
    struct func_st *func;
 
    DBUG_ENTER("impl_Inode_getStatus");
@@ -675,7 +675,7 @@ impl_Inode_getStatus(impl_POA_CorbaFS_Inode * servant,
       DBUG_PRINT("info",("Argument is directory, returning S_IFDIR"));
       *mode = S_IFDIR | S_IXUSR | S_IXGRP | S_IXOTH ; // Dir
    }
-     
+
    *mode |= S_IRUSR | S_IRGRP | S_IROTH; 
    *uid = 0;
    *gid = 0;
@@ -685,7 +685,7 @@ impl_Inode_getStatus(impl_POA_CorbaFS_Inode * servant,
    *atime = 3;
    *mtime = 2;
    *ctime = 1;
-       
+
 //   lstat(servant->path, &buf);
 //   *mode = buf.st_mode;
 /*   *uid = buf.st_uid;
@@ -922,7 +922,7 @@ impl_FileSystem_readlink(impl_POA_CorbaFS_FileSystem * servant,
    CORBA_char *retval = CORBA_OBJECT_NIL;
    char tmp[MAXPATHLEN + 1];
    int len;
-   
+
    DBUG_ENTER("impl_FileSystem_readlink");
    DBUG_PRINT("enter",("path: '%s'", filename));
 
@@ -989,4 +989,3 @@ int main(int argc, char *argv[]) {
 
   return 0;
 }
-
diff --git a/fs/mysqlcorbafs.h b/fs/mysqlcorbafs.h
index 4074d0e07b4..f805a1fb584 100644
--- a/fs/mysqlcorbafs.h
+++ b/fs/mysqlcorbafs.h
@@ -153,7 +153,5 @@ static struct format {
       char *middlecross;
       char *bottomcross;
 
-      
-} Human, HTML, CSF, XML;
-
 
+} Human, HTML, CSF, XML;
diff --git a/fs/mysqlcorbafs_test.c b/fs/mysqlcorbafs_test.c
index 81b76702303..bd7d9381744 100644
--- a/fs/mysqlcorbafs_test.c
+++ b/fs/mysqlcorbafs_test.c
@@ -15,7 +15,7 @@ main (int argc, char *argv[])
     CorbaFS_Buffer *buffer;
     CorbaFS_DirEntSeq *dirents;
     CorbaFS_dirent *dirent;
-    
+
     CORBA_unsigned_short mode;
     CORBA_unsigned_long uid;
     CORBA_unsigned_long gid;
@@ -25,9 +25,9 @@ main (int argc, char *argv[])
     CORBA_long atime;
     CORBA_long mtime;
     CORBA_long ctime;
-    
+
     int i;
-    
+
     int niters = 10;
 
     CORBA_exception_init(&ev);
@@ -45,12 +45,12 @@ main (int argc, char *argv[])
 	printf("Cannot bind to %s\n", argv[1]);
 	return 1;
     }
-    
+
     if (argc >= 3)
             inode = CorbaFS_FileSystem_getInode(fs, argv[2], &ev);
     else
             inode = CorbaFS_FileSystem_getInode(fs, "/proc/cpuinfo", &ev);
-    
+
     if (!inode)
     {
             printf("Cannot get inode\n");
@@ -67,7 +67,7 @@ main (int argc, char *argv[])
                             &mtime,
                             &ctime,
                             &ev);
-    
+
     printf("inode = %x\n", inode);
     CorbaFS_Inode_readpage(inode, &buffer, 100000, 100, &ev);
     printf("readpage got %d bytes\n", buffer->_length);
@@ -84,7 +84,7 @@ main (int argc, char *argv[])
             printf("%d = %s\n", dirent->inode, dirent->name);
             dirent++;
     }
-    
+
     CORBA_Object_release(fs, &ev);
     CORBA_Object_release((CORBA_Object)orb, &ev);