Skip to content

Commit

Permalink
Remove form feed characters
Browse files Browse the repository at this point in the history
Some older code in the tree uses form feed characters.  kdevelop does
not appear to preserve them, and it is not our current practice to use
them, so get rid of them in almost all files under src.  Leave alone
lib/gssapi/krb5/3des.txt, which is a formatted internet draft.
  • Loading branch information
greghudson committed Feb 12, 2016
1 parent 9526953 commit cc6903d
Show file tree
Hide file tree
Showing 30 changed files with 102 additions and 113 deletions.
7 changes: 1 addition & 6 deletions src/include/k5-thread.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
# define KRB5_CALLCONV_C
#endif

/* Interface (tentative):
/* Interface (tentative):
Mutex support:
Expand Down Expand Up @@ -134,7 +134,6 @@
More to be added, perhaps. */

#include <assert.h>


/* The mutex structure we use, k5_mutex_t, is defined to some
OS-specific bits. The use of multiple layers of typedefs are an
Expand Down Expand Up @@ -362,9 +361,6 @@ static inline int k5_os_mutex_lock(k5_os_mutex *m)

#endif




typedef k5_os_mutex k5_mutex_t;
#define K5_MUTEX_PARTIAL_INITIALIZER K5_OS_MUTEX_PARTIAL_INITIALIZER
static inline int k5_mutex_init(k5_mutex_t *m)
Expand Down Expand Up @@ -395,7 +391,6 @@ static inline void k5_mutex_unlock(k5_mutex_t *m)
#define k5_assert_locked k5_mutex_assert_locked
#define k5_assert_unlocked k5_mutex_assert_unlocked


/* Thread-specific data; implemented in a support file, because we'll
need to keep track of some global data for cleanup purposes.
Expand Down
5 changes: 1 addition & 4 deletions src/lib/apputils/net-server.c
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ set_pktinfo(int sock, int family)
return 0;
}


static const char *
paddr(struct sockaddr *sa)
{
Expand Down Expand Up @@ -197,7 +196,6 @@ struct connection {
int rpc_force_close;
};


#define SET(TYPE) struct { TYPE *data; size_t n, max; }

/* Start at the top and work down -- this should allow for deletions
Expand Down Expand Up @@ -369,7 +367,6 @@ loop_add_rpc_service(int port, u_long prognum,
return 0;
}


#define USE_AF AF_INET
#define USE_TYPE SOCK_DGRAM
#define USE_PROTO 0
Expand Down Expand Up @@ -660,7 +657,7 @@ setkeepalive(int sock)
{
return setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(one));
}


static int
setnolinger(int s)
{
Expand Down
6 changes: 4 additions & 2 deletions src/lib/crypto/ISSUES
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
Issues to be addressed for src/lib/crypto: -*- text -*-



Many files here and in subdirectories pollute the namespace.
However, some applications wanting to directly use some of those
routines will expect those names to be available.

Workaround: Shared library export lists? Define and export internal
names, and provide wrapper library code or weak functions under the
polluting names?



Some routines assume "int" is big enough to describe all buffers that
may be supplied.
4 changes: 2 additions & 2 deletions src/lib/crypto/builtin/des/ISSUES
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Issues to be addressed for src/lib/crypto/des: -*- text -*-


"const" could be used in more places


Array types are used in calling interfaces. Under ANSI C, a value of
type "arraytype *" cannot be assigned to a variable of type "const
arraytype *", so we get compilation warnings.
Expand Down
3 changes: 2 additions & 1 deletion src/lib/crypto/builtin/md4/ISSUES
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Issues to be addressed for src/lib/crypto/md4: -*- text -*-



Assumes int is >= 32 bits.
3 changes: 2 additions & 1 deletion src/lib/crypto/builtin/md5/ISSUES
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Issues to be addressed for src/lib/crypto/md5: -*- text -*-



Assumes int is >= 32 bits.
3 changes: 2 additions & 1 deletion src/lib/crypto/builtin/sha1/ISSUES
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Issues to be addressed for src/lib/crypto/sha1: -*- text -*-



Assumes int (look for "count") is >= 32 bits.

Changing the types of internal variables is easy, but shsUpdate takes
Expand Down
5 changes: 2 additions & 3 deletions src/lib/kadm5/logger.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
#define log_notice_string _("Notice")
#define log_info_string _("info")
#define log_debug_string _("debug")


/*
* Output logging.
*
Expand Down Expand Up @@ -161,7 +161,6 @@ static struct log_entry def_log_entry;
-1)
#define DEVICE_CLOSE(d) fclose(d)


/*
* klog_com_err_proc() - Handle com_err(3) messages as specified by the
* profile.
Expand Down Expand Up @@ -326,7 +325,7 @@ klog_com_err_proc(const char *whoami, long int code, const char *format, va_list
}
}
}


/*
* krb5_klog_init() - Initialize logging.
*
Expand Down
21 changes: 10 additions & 11 deletions src/lib/kadm5/srv/server_acl.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ static const char *acl_syn_err_msg = N_("%s: syntax error at line %d "
"<%10s...>");
static const char *acl_cantopen_msg = N_("%s while opening ACL file %s");


/*
* kadm5int_acl_get_line() - Get a line from the ACL file.
* Lines ending with \ are continued on the next line
Expand Down Expand Up @@ -157,7 +156,7 @@ kadm5int_acl_get_line(fp, lnp)
else
return(acl_buf);
}


/*
* kadm5int_acl_parse_line() - Parse the contents of an ACL line.
*/
Expand Down Expand Up @@ -260,7 +259,7 @@ kadm5int_acl_parse_line(lp)
("X kadm5int_acl_parse_line() = %x\n", (long) acle));
return(acle);
}


/*
* kadm5int_acl_parse_restrictions() - Parse optional restrictions field
*
Expand Down Expand Up @@ -360,7 +359,7 @@ kadm5int_acl_parse_restrictions(s, rpp)
code, (*rpp) ? (*rpp)->mask : 0));
return code;
}


/*
* kadm5int_acl_impose_restrictions() - impose restrictions, modifying *recp, *maskp
*
Expand Down Expand Up @@ -434,7 +433,7 @@ kadm5int_acl_impose_restrictions(kcontext, recp, maskp, rp)
("X kadm5int_acl_impose_restrictions() = 0, *maskp=0x%08x\n", *maskp));
return 0;
}


/*
* kadm5int_acl_free_entries() - Free all ACL entries.
*/
Expand Down Expand Up @@ -468,7 +467,7 @@ kadm5int_acl_free_entries()
acl_inited = 0;
DPRINT(DEBUG_CALLS, acl_debug_level, ("X kadm5int_acl_free_entries()\n"));
}


/*
* kadm5int_acl_load_acl_file() - Open and parse the ACL file.
*/
Expand Down Expand Up @@ -541,7 +540,7 @@ kadm5int_acl_load_acl_file()
("X kadm5int_acl_load_acl_file() = %d\n", retval));
return(retval);
}


/*
* kadm5int_acl_match_data() - See if two data entries match.
*
Expand Down Expand Up @@ -587,7 +586,7 @@ kadm5int_acl_match_data(const krb5_data *e1, const krb5_data *e2,
DPRINT(DEBUG_CALLS, acl_debug_level, ("X acl_match_entry()=%d\n",retval));
return(retval);
}


/*
* kadm5int_acl_find_entry() - Find a matching entry.
*/
Expand Down Expand Up @@ -693,7 +692,7 @@ kadm5int_acl_find_entry(krb5_context kcontext, krb5_const_principal principal,
DPRINT(DEBUG_CALLS, acl_debug_level, ("X kadm5int_acl_find_entry()=%x\n",entry));
return(entry);
}


/*
* kadm5int_acl_init() - Initialize ACL context.
*/
Expand All @@ -716,7 +715,7 @@ kadm5int_acl_init(kcontext, debug_level, acl_file)
DPRINT(DEBUG_CALLS, acl_debug_level, ("X kadm5int_acl_init() = %d\n", kret));
return(kret);
}


/*
* kadm5int_acl_finish - Terminate ACL context.
*/
Expand All @@ -729,7 +728,7 @@ kadm5int_acl_finish(kcontext, debug_level)
kadm5int_acl_free_entries();
DPRINT(DEBUG_CALLS, acl_debug_level, ("X kadm5int_acl_finish()\n"));
}


/*
* kadm5int_acl_check_krb() - Is this operation permitted for this principal?
*/
Expand Down
8 changes: 4 additions & 4 deletions src/lib/krb5/ccache/ser_cc.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ static const krb5_ser_entry krb5_ccache_ser_entry = {
krb5_ccache_externalize, /* Externalize routine */
krb5_ccache_internalize /* Internalize routine */
};


/*
* krb5_ccache_size() - Determine the size required to externalize
* this krb5_ccache variant.
Expand Down Expand Up @@ -84,7 +84,7 @@ krb5_ccache_size(krb5_context kcontext, krb5_pointer arg, size_t *sizep)
}
return(kret);
}


/*
* krb5_ccache_externalize() - Externalize the krb5_ccache.
*/
Expand Down Expand Up @@ -139,7 +139,7 @@ krb5_ccache_externalize(krb5_context kcontext, krb5_pointer arg, krb5_octet **bu
}
return(kret);
}


/*
* krb5_ccache_internalize() - Internalize the krb5_ccache.
*/
Expand Down Expand Up @@ -204,7 +204,7 @@ krb5_ccache_internalize(krb5_context kcontext, krb5_pointer *argp, krb5_octet **
free(ccname);
return(kret);
}


/*
* Register the ccache serializer.
*/
Expand Down
6 changes: 3 additions & 3 deletions src/lib/krb5/keytab/kt_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ const krb5_ser_entry krb5_ktfile_ser_entry = {
krb5_ktf_keytab_externalize, /* Externalize routine */
krb5_ktf_keytab_internalize /* Internalize routine */
};


/*
* krb5_ktf_keytab_size() - Determine the size required to externalize
* this krb5_keytab variant.
Expand Down Expand Up @@ -612,7 +612,7 @@ krb5_ktf_keytab_size(krb5_context kcontext, krb5_pointer arg, size_t *sizep)
}
return(kret);
}


/*
* krb5_ktf_keytab_externalize() - Externalize the krb5_keytab.
*/
Expand Down Expand Up @@ -708,7 +708,7 @@ krb5_ktf_keytab_externalize(krb5_context kcontext, krb5_pointer arg, krb5_octet
}
return(kret);
}


/*
* krb5_ktf_keytab_internalize() - Internalize the krb5_ktf_keytab.
*/
Expand Down
3 changes: 1 addition & 2 deletions src/lib/krb5/krb/chk_trans.c
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,6 @@ foreach_realm (krb5_error_code (*fn)(krb5_data *comp,void *data), void *data,
return 0;
}


struct check_data {
krb5_context ctx;
krb5_principal *tgs;
Expand Down Expand Up @@ -355,7 +354,7 @@ krb5_check_transited_list (krb5_context ctx, const krb5_data *trans_in,
krb5_free_realm_tree (ctx, cdata.tgs);
return r;
}


#ifdef TEST

static krb5_error_code
Expand Down
8 changes: 4 additions & 4 deletions src/lib/krb5/krb/ser_actx.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ static const krb5_ser_entry krb5_auth_context_ser_entry = {
krb5_auth_context_externalize, /* Externalize routine */
krb5_auth_context_internalize /* Internalize routine */
};


/*
* krb5_auth_context_size() - Determine the size required to externalize
* the krb5_auth_context.
Expand Down Expand Up @@ -172,7 +172,7 @@ krb5_auth_context_size(krb5_context kcontext, krb5_pointer arg, size_t *sizep)
*sizep += required;
return(kret);
}


/*
* krb5_auth_context_externalize() - Externalize the krb5_auth_context.
*/
Expand Down Expand Up @@ -316,7 +316,7 @@ krb5_auth_context_externalize(krb5_context kcontext, krb5_pointer arg, krb5_octe
}
return(kret);
}


/* Internalize a keyblock and convert it to a key. */
static krb5_error_code
intern_key(krb5_context ctx, krb5_key *key, krb5_octet **bp, size_t *sp)
Expand Down Expand Up @@ -515,7 +515,7 @@ krb5_auth_context_internalize(krb5_context kcontext, krb5_pointer *argp, krb5_oc
}
return(kret);
}


/*
* Register the auth_context serializer.
*/
Expand Down
8 changes: 4 additions & 4 deletions src/lib/krb5/krb/ser_adata.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ static const krb5_ser_entry krb5_authdata_ser_entry = {
krb5_authdata_externalize, /* Externalize routine */
krb5_authdata_internalize /* Internalize routine */
};


/*
* krb5_authdata_esize() - Determine the size required to externalize
* the krb5_authdata.
Expand Down Expand Up @@ -77,7 +77,7 @@ krb5_authdata_size(krb5_context kcontext, krb5_pointer arg, size_t *sizep)
}
return(kret);
}


/*
* krb5_authdata_externalize() - Externalize the krb5_authdata.
*/
Expand Down Expand Up @@ -123,7 +123,7 @@ krb5_authdata_externalize(krb5_context kcontext, krb5_pointer arg, krb5_octet **
}
return(kret);
}


/*
* krb5_authdata_internalize() - Internalize the krb5_authdata.
*/
Expand Down Expand Up @@ -183,7 +183,7 @@ krb5_authdata_internalize(krb5_context kcontext, krb5_pointer *argp, krb5_octet
}
return(kret);
}


/*
* Register the authdata serializer.
*/
Expand Down

0 comments on commit cc6903d

Please sign in to comment.