From bf1573f9e1badcddfc96f8fc7b5701784bd139ab Mon Sep 17 00:00:00 2001 From: Tony Cook Date: Sat, 11 Mar 2006 13:16:47 +0000 Subject: [PATCH] rename some private functions to private names --- Imager.pm | 32 ++++++++++++++++---------------- Imager.xs | 6 +++--- log.c | 8 ++++---- log.h | 10 +++++----- t/t50basicoo.t | 4 ++-- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Imager.pm b/Imager.pm index d36a3844..7b1c7a7b 100644 --- a/Imager.pm +++ b/Imager.pm @@ -423,8 +423,8 @@ BEGIN { #} sub init_log { - m_init_log($_[0],$_[1]); - log_entry("Imager $VERSION starting\n", 1); + i_init_log($_[0],$_[1]); + i_log_entry("Imager $VERSION starting\n", 1); } @@ -1776,10 +1776,10 @@ sub scale { my ($xpix, $ypix)=( $opts{xpixels} / $self->getwidth() , $opts{ypixels} / $self->getheight() ); if ($opts{'type'} eq 'min') { - $scalefactor = min($xpix,$ypix); + $scalefactor = _min($xpix,$ypix); } elsif ($opts{'type'} eq 'max') { - $scalefactor = max($xpix,$ypix); + $scalefactor = _max($xpix,$ypix); } else { $self->_set_error('invalid value for type parameter'); @@ -2222,10 +2222,10 @@ sub box { my %opts=(color=>$dflcl,xmin=>0,ymin=>0,xmax=>$self->getwidth()-1,ymax=>$self->getheight()-1,@_); if (exists $opts{'box'}) { - $opts{'xmin'} = min($opts{'box'}->[0],$opts{'box'}->[2]); - $opts{'xmax'} = max($opts{'box'}->[0],$opts{'box'}->[2]); - $opts{'ymin'} = min($opts{'box'}->[1],$opts{'box'}->[3]); - $opts{'ymax'} = max($opts{'box'}->[1],$opts{'box'}->[3]); + $opts{'xmin'} = _min($opts{'box'}->[0],$opts{'box'}->[2]); + $opts{'xmax'} = _max($opts{'box'}->[0],$opts{'box'}->[2]); + $opts{'ymin'} = _min($opts{'box'}->[1],$opts{'box'}->[3]); + $opts{'ymax'} = _max($opts{'box'}->[1],$opts{'box'}->[3]); } if ($opts{filled}) { @@ -2266,7 +2266,7 @@ sub arc { unless ($self->{IMG}) { $self->{ERRSTR}='empty input image'; return undef; } my $dflcl=i_color_new(255,255,255,255); my %opts=(color=>$dflcl, - 'r'=>min($self->getwidth(),$self->getheight())/3, + 'r'=>_min($self->getwidth(),$self->getheight())/3, 'x'=>$self->getwidth()/2, 'y'=>$self->getheight()/2, 'd1'=>0, 'd2'=>361, @_); @@ -3064,7 +3064,7 @@ sub def_guess_type { # get the minimum of a list -sub min { +sub _min { my $mx=shift; for(@_) { if ($_<$mx) { $mx=$_; }} return $mx; @@ -3072,7 +3072,7 @@ sub min { # get the maximum of a list -sub max { +sub _max { my $mx=shift; for(@_) { if ($_>$mx) { $mx=$_; }} return $mx; @@ -3080,7 +3080,7 @@ sub max { # string stuff for iptc headers -sub clean { +sub _clean { my($str)=$_[0]; $str = substr($str,3); $str =~ s/[\n\r]//g; @@ -3109,19 +3109,19 @@ sub parseiptc { @sar=split(/\034\002/); foreach $item (@sar) { if ($item =~ m/^x/) { - $caption=&clean($item); + $caption = _clean($item); $i++; } if ($item =~ m/^P/) { - $photogr=&clean($item); + $photogr = _clean($item); $i++; } if ($item =~ m/^i/) { - $headln=&clean($item); + $headln = _clean($item); $i++; } if ($item =~ m/^n/) { - $credit=&clean($item); + $credit = _clean($item); $i++; } } diff --git a/Imager.xs b/Imager.xs index b349641e..531dd626 100644 --- a/Imager.xs +++ b/Imager.xs @@ -108,7 +108,7 @@ void my_SvREFCNT_dec(void *p) { static void -log_entry(char *string, int level) { +i_log_entry(char *string, int level) { mm_log((level, string)); } @@ -1160,12 +1160,12 @@ i_sametype_chans(im, x, y, channels) int channels void -m_init_log(name,level) +i_init_log(name,level) char* name int level void -log_entry(string,level) +i_log_entry(string,level) char* string int level diff --git a/log.c b/log.c index 4d7cd44a..52f39397 100644 --- a/log.c +++ b/log.c @@ -19,7 +19,7 @@ static char data_buffer[DATABUFF]; */ void -m_init_log(const char* name,int level) { +i_init_log(const char* name,int level) { log_level = level; if (level < 0) { lg_file = NULL; @@ -61,7 +61,7 @@ m_fatal(int exitcode,const char *fmt, ... ) { * Logging is inactive - insert dummy functions */ -void m_init_log(const char* name,int onoff) {} +void i_init_log(const char* name,int onoff) {} void m_fatal(int exitcode,const char *fmt, ... ) { exit(exitcode); } @@ -69,7 +69,7 @@ void m_fatal(int exitcode,const char *fmt, ... ) { exit(exitcode); } void -m_loog(int level,const char *fmt, ... ) { +i_loog(int level,const char *fmt, ... ) { va_list ap; if (level > log_level) return; if (lg_file != NULL) { @@ -84,7 +84,7 @@ m_loog(int level,const char *fmt, ... ) { void -m_lhead(const char *file, int line) { +i_lhead(const char *file, int line) { time_t timi; struct tm *str_tm; diff --git a/log.h b/log.h index 7c9cc97c..12d3467b 100644 --- a/log.h +++ b/log.h @@ -10,14 +10,14 @@ global: creates a global variable FILE* lg_file */ -void m_lhead ( const char *file, int line ); -void m_init_log( const char *name, int onoff ); -void m_loog(int level,const char *msg, ... ); -void m_fatal ( int exitcode,const char *fmt, ... ); +void i_lhead ( const char *file, int line ); +void i_init_log( const char *name, int onoff ); +void i_loog(int level,const char *msg, ... ); +void i_fatal ( int exitcode,const char *fmt, ... ); #ifdef IMAGER_LOG -#define mm_log(x) { m_lhead(__FILE__,__LINE__); m_loog x; } +#define mm_log(x) { i_lhead(__FILE__,__LINE__); i_loog x; } #else #define mm_log(x) #endif diff --git a/t/t50basicoo.t b/t/t50basicoo.t index 5138196c..ad45eaa9 100644 --- a/t/t50basicoo.t +++ b/t/t50basicoo.t @@ -355,7 +355,7 @@ sub ok { ++$test_num; if ($ok) { print "ok $test_num # $msg\n"; - Imager::log_entry("ok $test_num # $msg\n", 0); + Imager::i_log_entry("ok $test_num # $msg\n", 0); } else { my $err; @@ -364,7 +364,7 @@ sub ok { my $line = "not ok $test_num # line ".(caller)[2].": $msg"; $line .= ": $err" if $err; print $line, "\n"; - Imager::log_entry($line."\n", 0); + Imager::i_log_entry($line."\n", 0); } skip($why, $skipcount) if defined $why; $ok; -- 2.39.5