Commit 0e10a590 authored by Ian Goldberg's avatar Ian Goldberg

Add otrl_ to the names of two exported context_priv functions

libotr was exporting exactly two functions without the otrl_ prefix:
context_priv_new and context_priv_force_finished.  Change the names of
these functions to start with otrl_.  Thanks to David Goulet
<dgoulet@ev0ke.net> for noticing it.
parent fcce387a
2012-08-26
* src/context.c:
* src/context_priv.c:
* src/context_priv.h: libotr was exporting exactly two functions
without the otrl_ prefix: context_priv_new and
context_priv_force_finished. Change the names of these
functions to start with otrl_. Thanks to David Goulet
<dgoulet@ev0ke.net> for noticing it.
2012-08-25
* src/sm.c:
......
......@@ -154,7 +154,7 @@ static ConnContext * new_context(const char * user, const char * accountname,
context->otr_offer = OFFER_NOT;
context->app_data = NULL;
context->app_data_free = NULL;
context->context_priv = context_priv_new();
context->context_priv = otrl_context_priv_new();
assert(context->context_priv != NULL);
context->next = NULL;
context->m_context = context;
......@@ -420,7 +420,7 @@ void otrl_context_force_finished(ConnContext *context)
context->sessionid_len = 0;
context->protocol_version = 0;
otrl_sm_state_free(context->smstate);
context_priv_force_finished(context->context_priv);
otrl_context_priv_force_finished(context->context_priv);
}
/* Force a context into the OTRL_MSGSTATE_PLAINTEXT state. */
......
......@@ -29,7 +29,7 @@
#include "context_priv.h"
/* Create a new private connection context */
ConnContextPriv *context_priv_new()
ConnContextPriv *otrl_context_priv_new()
{
ConnContextPriv *context_priv;
context_priv = malloc(sizeof(*context_priv));
......@@ -67,7 +67,7 @@ ConnContextPriv *context_priv_new()
/* Resets the appropriate variables when a context
* is being force finished
*/
void context_priv_force_finished(ConnContextPriv *context_priv)
void otrl_context_priv_force_finished(ConnContextPriv *context_priv)
{
free(context_priv->fragment);
context_priv->fragment = NULL;
......
......@@ -86,9 +86,9 @@ typedef struct context_priv {
} ConnContextPriv;
/* Create a new private connection context. */
ConnContextPriv *context_priv_new();
ConnContextPriv *otrl_context_priv_new();
/* Frees up memory that was used in context_priv_new */
void context_priv_force_finished(ConnContextPriv *context_priv);
/* Frees up memory that was used in otrl_context_priv_new */
void otrl_context_priv_force_finished(ConnContextPriv *context_priv);
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment