s3: Fix some nonempty blank lines

[samba.git] / source3 / registry / reg_backend_shares.c

diff --git a/source3/registry/reg_backend_shares.c b/source3/registry/reg_backend_shares.c
index ee9e5dc5a1848e675e34c1bcc85795567f3ad3d7..22b8fd7ed28bb18df3512cd36b9e12236f6f4394 100644 (file)
--- a/source3/registry/reg_backend_shares.c
+++ b/source3/registry/reg_backend_shares.c
@@ -26,7 +26,7 @@
 
 /**********************************************************************
  It is safe to assume that every registry path passed into on of 
- the exported functions here begins with KEY_PRINTING else
+ the exported functions here begins with KEY_SHARES else
  these functions would have never been called.  This is a small utility
  function to strip the beginning of the path and make a copy that the 
  caller can modify.  Note that the caller is responsible for releasing
@@ -37,24 +37,23 @@ static char* trim_reg_path( const char *path )
 {
        const char *p;
        uint16 key_len = strlen(KEY_SHARES);
-       
+
        /* 
         * sanity check...this really should never be True.
         * It is only here to prevent us from accessing outside
         * the path buffer in the extreme case.
         */
-       
+
        if ( strlen(path) < key_len ) {
                DEBUG(0,("trim_reg_path: Registry path too short! [%s]\n", path));
                return NULL;
        }
-       
-       
+
        p = path + strlen( KEY_SHARES );
-       
+
        if ( *p == '\\' )
                p++;
-       
+
        if ( *p )
                return SMB_STRDUP(p);
        else
@@ -65,22 +64,22 @@ static char* trim_reg_path( const char *path )
  Enumerate registry subkey names given a registry path.  
  Caller is responsible for freeing memory to **subkeys
  *********************************************************************/
- 
-static int shares_subkey_info( const char *key, REGSUBKEY_CTR *subkey_ctr )
+
+static int shares_subkey_info( const char *key, struct regsubkey_ctr *subkey_ctr )
 {
        char            *path;
        bool            top_level = False;
        int             num_subkeys = 0;
-       
+
        DEBUG(10,("printing_subkey_info: key=>[%s]\n", key));
-       
+
        path = trim_reg_path( key );
-       
+
        /* check to see if we are dealing with the top level key */
-       
+
        if ( !path )
                top_level = True;
-               
+
        if ( top_level ) {
                num_subkeys = 1;
                regsubkey_ctr_addkey( subkey_ctr, "Security" );
@@ -89,9 +88,9 @@ static int shares_subkey_info( const char *key, REGSUBKEY_CTR *subkey_ctr )
        else
                num_subkeys = handle_share_subpath( path, subkey_ctr, NULL );
 #endif
-       
+
        SAFE_FREE( path );
-       
+
        return num_subkeys;
 }
 
@@ -100,21 +99,21 @@ static int shares_subkey_info( const char *key, REGSUBKEY_CTR *subkey_ctr )
  Caller is responsible for freeing memory 
  *********************************************************************/
 
-static int shares_value_info( const char *key, REGVAL_CTR *val )
+static int shares_value_info(const char *key, struct regval_ctr *val)
 {
        char            *path;
        bool            top_level = False;
        int             num_values = 0;
-       
+
        DEBUG(10,("printing_value_info: key=>[%s]\n", key));
-       
+
        path = trim_reg_path( key );
-       
+
        /* check to see if we are dealing with the top level key */
-       
+
        if ( !path )
                top_level = True;
-       
+
        /* fill in values from the getprinterdata_printer_server() */
        if ( top_level )
                num_values = 0;
@@ -122,9 +121,9 @@ static int shares_value_info( const char *key, REGVAL_CTR *val )
        else
                num_values = handle_printing_subpath( path, NULL, val );
 #endif
-               
+
        SAFE_FREE(path);
-       
+
        return num_values;
 }
 
@@ -134,7 +133,7 @@ static int shares_value_info( const char *key, REGVAL_CTR *val )
  (for now at least)
  *********************************************************************/
 
-static bool shares_store_subkey( const char *key, REGSUBKEY_CTR *subkeys )
+static bool shares_store_subkey( const char *key, struct regsubkey_ctr *subkeys )
 {
        return False;
 }
@@ -145,7 +144,7 @@ static bool shares_store_subkey( const char *key, REGSUBKEY_CTR *subkeys )
  (for now at least)
  *********************************************************************/
 
-static bool shares_store_value( const char *key, REGVAL_CTR *val )
+static bool shares_store_value(const char *key, struct regval_ctr *val)
 {
        return False;
 }
@@ -154,7 +153,7 @@ static bool shares_store_value( const char *key, REGVAL_CTR *val )
  * Table of function pointers for accessing printing data
  */
  
-REGISTRY_OPS shares_reg_ops = {
+struct registry_ops shares_reg_ops = {
        .fetch_subkeys = shares_subkey_info,
        .fetch_values = shares_value_info,
        .store_subkeys = shares_store_subkey,