← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbxt/src/thread_xt.cc

  • Committer: Monty Taylor
  • Date: 2010-06-20 19:25:46 UTC
  • mto: (1626.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1633.
  • Revision ID: mordred@inaugust.com-20100620192546-vb496u81mnxepu9u
Replaced terrible casting with strdup+free.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbxt/src/thread_xt.cc
1
 
/* Copyright (C) 2005 PrimeBase Technologies GmbH
 
1
/* Copyright (c) 2005 PrimeBase Technologies GmbH
2
2
 *
3
3
 * PrimeBase XT
4
4
 *
14
14
 *
15
15
 * You should have received a copy of the GNU General Public License
16
16
 * along with this program; if not, write to the Free Software
17
 
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
17
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
18
 *
19
19
 * 2005-01-03   Paul McCullagh
20
20
 *
258
258
#else
259
259
        /* Use the buffer, unless it is too small */
260
260
        va_list ap2;
261
 
        int bufsize;
262
261
 
263
262
        va_copy(ap2, ap);
264
 
        bufsize = vsnprintf(buffer, DEFAULT_LOG_BUFFER_SIZE, fmt, ap);
265
 
        if (bufsize >= DEFAULT_LOG_BUFFER_SIZE) {
266
 
                log_string = (char *) malloc(bufsize + 1);
267
 
                if (vsnprintf(log_string, bufsize + 1, fmt, ap2) > bufsize) {
268
 
                        free(log_string);
 
263
        if (vsnprintf(buffer, DEFAULT_LOG_BUFFER_SIZE, fmt, ap) >= DEFAULT_LOG_BUFFER_SIZE) {
 
264
                if (vasprintf(&log_string, fmt, ap2) == -1)
269
265
                        log_string = NULL;
270
 
                }
271
266
        }
272
267
        else
273
268
                log_string = buffer;
861
856
        char buffer[XT_TABLE_NAME_BUF_SIZE];
862
857
 
863
858
        xt_tab_make_table_name(tab_item, buffer, sizeof(buffer));
864
 
        xt_register_i2xterr(func, file, line, xt_err, buffer, item2);
 
859
        xt_strcat(sizeof(buffer), buffer, ".");
 
860
        xt_strcat(sizeof(buffer), buffer, item2);
 
861
        xt_register_ixterr(func, file, line, xt_err, buffer);
865
862
}
866
863
 
867
864
xtPublic void xt_register_taberr(c_char *func, c_char *file, u_int line, int xt_err, XTPathStrPtr tab_item)