summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-02-07 11:05:07 +0100
committerVolker Lendecke <vl@samba.org>2010-02-07 12:29:25 +0100
commit5552b44960c5bb95f6478b41b42d7537d03cd8fd (patch)
tree9a856e6dd406da2691ed817392be3e3b6a83d0a1
parente2ddda32897f96a336aa1c0f6198381a2843dd04 (diff)
downloadsamba-5552b44960c5bb95f6478b41b42d7537d03cd8fd.tar.gz
samba-5552b44960c5bb95f6478b41b42d7537d03cd8fd.tar.bz2
samba-5552b44960c5bb95f6478b41b42d7537d03cd8fd.zip
s3: Fix some nonempty blank lines
-rw-r--r--source3/libsmb/clifsinfo.c6
-rw-r--r--source3/registry/reg_api.c8
-rw-r--r--source3/registry/reg_backend_printing.c92
3 files changed, 53 insertions, 53 deletions
diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index 38382e4af7..48c378259d 100644
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -3,17 +3,17 @@
FS info functions
Copyright (C) Stefan (metze) Metzmacher 2003
Copyright (C) Jeremy Allison 2007
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index 9aff4b05ca..6589a61470 100644
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -148,9 +148,9 @@ static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx,
key = regkey->key;
talloc_set_destructor(key, regkey_destructor);
-
+
/* initialization */
-
+
key->type = REG_KEY_GENERIC;
if (name[0] == '\0') {
@@ -182,7 +182,7 @@ static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx,
if( StrnCaseCmp(key->name, KEY_HKPD, strlen(KEY_HKPD)) == 0 )
key->type = REG_KEY_HKPD;
-
+
/* Look up the table of registry I/O operations */
if ( !(key->ops = reghook_cache_find( key->name )) ) {
@@ -215,7 +215,7 @@ static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx,
*pregkey = regkey;
result = WERR_OK;
-
+
done:
if ( !W_ERROR_IS_OK(result) ) {
TALLOC_FREE(regkey);
diff --git a/source3/registry/reg_backend_printing.c b/source3/registry/reg_backend_printing.c
index 90ccc33c4c..278ad4fa46 100644
--- a/source3/registry/reg_backend_printing.c
+++ b/source3/registry/reg_backend_printing.c
@@ -255,17 +255,17 @@ static int key_printers_fetch_keys( const char *key, struct regsubkey_ctr *subke
}
num_subkeys = get_printer_subkeys( printer->info_2->data, printerdatakey?printerdatakey:"", &subkey_names );
-
+
for ( i=0; i<num_subkeys; i++ )
regsubkey_ctr_addkey( subkeys, subkey_names[i] );
-
+
free_a_printer( &printer, 2 );
-
+
/* no other subkeys below here */
done:
SAFE_FREE( subkey_names );
-
+
return num_subkeys;
}
@@ -281,17 +281,17 @@ static bool add_printers_by_registry( struct regsubkey_ctr *subkeys )
char *printername;
NT_PRINTER_INFO_LEVEL_2 info2;
NT_PRINTER_INFO_LEVEL printer;
-
+
ZERO_STRUCT( info2 );
printer.info_2 = &info2;
-
+
num_keys = regsubkey_ctr_numkeys( subkeys );
-
+
become_root();
for ( i=0; i<num_keys; i++ ) {
printername = regsubkey_ctr_specific_key( subkeys, i );
snum = find_service( printername );
-
+
/* just verify a valied snum for now */
if ( snum == -1 ) {
fstrcpy( info2.printername, printername );
@@ -318,34 +318,34 @@ static bool key_printers_store_keys( const char *key, struct regsubkey_ctr *subk
int i, num_subkeys, num_existing_keys;
char *subkeyname;
fstring *existing_subkeys = NULL;
-
+
printers_key = strip_printers_prefix( key );
-
+
if ( !printers_key ) {
/* have to deal with some new or deleted printer */
return add_printers_by_registry( subkeys );
}
-
+
if (!reg_split_path( printers_key, &printername, &printerdatakey )) {
return False;
}
-
+
/* lookup the printer */
-
+
if ( !W_ERROR_IS_OK(get_a_printer(NULL, &printer, 2, printername)) ) {
DEBUG(0,("key_printers_store_keys: Tried to store subkey for bad printername %s\n",
printername));
return False;
}
-
+
/* get the top level printer keys */
-
+
num_existing_keys = get_printer_subkeys( printer->info_2->data, "", &existing_subkeys );
-
+
for ( i=0; i<num_existing_keys; i++ ) {
-
+
/* remove the key if it has been deleted */
-
+
if ( !regsubkey_ctr_key_exists( subkeys, existing_subkeys[i] ) ) {
DEBUG(5,("key_printers_store_keys: deleting key %s\n",
existing_subkeys[i]));
@@ -366,13 +366,13 @@ static bool key_printers_store_keys( const char *key, struct regsubkey_ctr *subk
}
}
}
-
+
/* write back to disk */
-
+
mod_a_printer( printer, 2 );
-
+
/* cleanup */
-
+
free_a_printer( &printer, 2 );
SAFE_FREE( existing_subkeys );
@@ -388,12 +388,12 @@ static void fill_in_printer_values(NT_PRINTER_INFO_LEVEL_2 *info2, struct regval
struct spoolss_DeviceMode *devmode;
char *p;
uint32 printer_status = PRINTER_STATUS_OK;
-
+
regval_ctr_addvalue( values, "Attributes", REG_DWORD, (char*)&info2->attributes, sizeof(info2->attributes) );
regval_ctr_addvalue( values, "Priority", REG_DWORD, (char*)&info2->priority, sizeof(info2->attributes) );
regval_ctr_addvalue( values, "ChangeID", REG_DWORD, (char*)&info2->changeid, sizeof(info2->changeid) );
regval_ctr_addvalue( values, "Default Priority", REG_DWORD, (char*)&info2->default_priority, sizeof(info2->default_priority) );
-
+
/* lie and say everything is ok since we don't want to call print_queue_length() to get the real status */
regval_ctr_addvalue( values, "Status", REG_DWORD, (char*)&printer_status, sizeof(info2->status) );
@@ -464,32 +464,32 @@ static int key_printers_fetch_values(const char *key, struct regval_ctr *values)
NT_PRINTER_INFO_LEVEL *printer = NULL;
NT_PRINTER_DATA *p_data;
int i, key_index;
-
+
printers_key = strip_printers_prefix( key );
-
+
/* top level key values stored in the registry has no values */
-
+
if ( !printers_key ) {
/* normalize to the 'HKLM\SOFTWARE\...\Print\Printers' key */
return regdb_fetch_values( KEY_WINNT_PRINTERS, values );
}
-
+
/* lookup the printer object */
-
+
if (!reg_split_path( printers_key, &printername, &printerdatakey )) {
return -1;
}
-
+
if ( !W_ERROR_IS_OK( get_a_printer(NULL, &printer, 2, printername) ) )
goto done;
-
+
if ( !printerdatakey ) {
fill_in_printer_values( printer->info_2, values );
goto done;
}
-
+
/* iterate over all printer data keys and fill the regval container */
-
+
p_data = printer->info_2->data;
if ( (key_index = lookup_printerkey( p_data, printerdatakey )) == -1 ) {
/* failure....should never happen if the client has a valid open handle first */
@@ -497,16 +497,16 @@ static int key_printers_fetch_values(const char *key, struct regval_ctr *values)
free_a_printer( &printer, 2 );
return -1;
}
-
+
num_values = regval_ctr_numvals( p_data->keys[key_index].values );
for ( i=0; i<num_values; i++ )
regval_ctr_copyvalue( values, regval_ctr_specific_value(p_data->keys[key_index].values, i) );
-
+
done:
if ( printer )
free_a_printer( &printer, 2 );
-
+
return regval_ctr_numvals( values );
}
@@ -563,12 +563,12 @@ struct {
static int find_valuename_index( const char *valuename )
{
int i;
-
+
for ( i=0; printer_values_map[i].name; i++ ) {
if ( strequal( valuename, printer_values_map[i].name ) )
return printer_values_map[i].index;
}
-
+
return -1;
}
@@ -590,14 +590,14 @@ static void convert_values_to_printer_info_2(TALLOC_CTX *mem_ctx,
uint32 value_index;
struct regval_blob *val;
int i;
-
+
for ( i=0; i<num_values; i++ ) {
DATA_BLOB blob;
val = regval_ctr_specific_value( values, i );
value_index = find_valuename_index( regval_name( val ) );
blob = data_blob_const(regval_data_p(val), regval_size(val));
-
+
switch( value_index ) {
case REG_IDX_ATTRIBUTES:
printer2->attributes = (uint32)(*regval_data_p(val));
@@ -657,7 +657,7 @@ static void convert_values_to_printer_info_2(TALLOC_CTX *mem_ctx,
regval_name( val ) ));
}
}
-
+
return;
}
@@ -671,16 +671,16 @@ static bool key_printers_store_values(const char *key, struct regval_ctr *values
NT_PRINTER_INFO_LEVEL *printer = NULL;
WERROR result;
TALLOC_CTX *mem_ctx = talloc_init("key_printers_store_values");
-
+
printers_key = strip_printers_prefix( key );
-
+
/* values in the top level key get stored in the registry */
if ( !printers_key ) {
/* normalize on the 'HKLM\SOFTWARE\....\Print\Printers' key */
return regdb_store_values( KEY_WINNT_PRINTERS, values );
}
-
+
if (!reg_split_path( printers_key, &printername, &keyname )) {
return False;
}
@@ -697,9 +697,9 @@ static bool key_printers_store_values(const char *key, struct regval_ctr *values
int num_values = regval_ctr_numvals( values );
int i;
struct regval_blob *val;
-
+
delete_printer_key( printer->info_2->data, keyname );
-
+
/* deal with any subkeys */
for ( i=0; i<num_values; i++ ) {
val = regval_ctr_specific_value( values, i );