aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2008-03-24 01:46:34 -0400
committerDavid S. Miller <davem@davemloft.net>2008-03-24 01:46:34 -0400
commit2444844cefd2ce0ac73858cf980de07e33a5dd20 (patch)
tree17358f567c46db97baa363be468aed8a051fba2d
parent3d3b2d25a4debaff05a9e6f5c55a0d31e4334234 (diff)
[SCTP]: Replace char msg[] with static const char[].
133886 2004 220 136110 213ae sctp.new/sctp.o 134018 2004 220 136242 21432 sctp.old/sctp.o Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/sctp/sm_make_chunk.c2
-rw-r--r--net/sctp/sm_statefuns.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 578630e8e00d..c8982452580e 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -1782,7 +1782,7 @@ static int sctp_process_inv_paramlength(const struct sctp_association *asoc,
1782 const struct sctp_chunk *chunk, 1782 const struct sctp_chunk *chunk,
1783 struct sctp_chunk **errp) 1783 struct sctp_chunk **errp)
1784{ 1784{
1785 char error[] = "The following parameter had invalid length:"; 1785 static const char error[] = "The following parameter had invalid length:";
1786 size_t payload_len = WORD_ROUND(sizeof(error)) + 1786 size_t payload_len = WORD_ROUND(sizeof(error)) +
1787 sizeof(sctp_paramhdr_t); 1787 sizeof(sctp_paramhdr_t);
1788 1788
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index c0c6bee77cf5..6545b5fcbc73 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -4219,7 +4219,7 @@ static sctp_disposition_t sctp_sf_violation_chunklen(
4219 void *arg, 4219 void *arg,
4220 sctp_cmd_seq_t *commands) 4220 sctp_cmd_seq_t *commands)
4221{ 4221{
4222 char err_str[]="The following chunk had invalid length:"; 4222 static const char err_str[]="The following chunk had invalid length:";
4223 4223
4224 return sctp_sf_abort_violation(ep, asoc, arg, commands, err_str, 4224 return sctp_sf_abort_violation(ep, asoc, arg, commands, err_str,
4225 sizeof(err_str)); 4225 sizeof(err_str));
@@ -4236,7 +4236,7 @@ static sctp_disposition_t sctp_sf_violation_paramlen(
4236 const sctp_subtype_t type, 4236 const sctp_subtype_t type,
4237 void *arg, 4237 void *arg,
4238 sctp_cmd_seq_t *commands) { 4238 sctp_cmd_seq_t *commands) {
4239 char err_str[] = "The following parameter had invalid length:"; 4239 static const char err_str[] = "The following parameter had invalid length:";
4240 4240
4241 return sctp_sf_abort_violation(ep, asoc, arg, commands, err_str, 4241 return sctp_sf_abort_violation(ep, asoc, arg, commands, err_str,
4242 sizeof(err_str)); 4242 sizeof(err_str));
@@ -4255,7 +4255,7 @@ static sctp_disposition_t sctp_sf_violation_ctsn(
4255 void *arg, 4255 void *arg,
4256 sctp_cmd_seq_t *commands) 4256 sctp_cmd_seq_t *commands)
4257{ 4257{
4258 char err_str[]="The cumulative tsn ack beyond the max tsn currently sent:"; 4258 static const char err_str[]="The cumulative tsn ack beyond the max tsn currently sent:";
4259 4259
4260 return sctp_sf_abort_violation(ep, asoc, arg, commands, err_str, 4260 return sctp_sf_abort_violation(ep, asoc, arg, commands, err_str,
4261 sizeof(err_str)); 4261 sizeof(err_str));
@@ -4274,7 +4274,7 @@ static sctp_disposition_t sctp_sf_violation_chunk(
4274 void *arg, 4274 void *arg,
4275 sctp_cmd_seq_t *commands) 4275 sctp_cmd_seq_t *commands)
4276{ 4276{
4277 char err_str[]="The following chunk violates protocol:"; 4277 static const char err_str[]="The following chunk violates protocol:";
4278 4278
4279 if (!asoc) 4279 if (!asoc)
4280 return sctp_sf_violation(ep, asoc, type, arg, commands); 4280 return sctp_sf_violation(ep, asoc, type, arg, commands);