← Back to branch summary

~ubuntu-branches/ubuntu/hardy/opencryptoki/hardy

« back to all changes in this revision

Viewing changes to usr/lib/pkcs11/api/apiutil.c

  • Committer: Bazaar Package Importer
  • Author(s): Stephan Hermann
  • Date: 2008-01-24 14:22:58 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20080124142258-i0nmjvqoy6wxe8x1
Tags: 2.2.5+dfsg-1ubuntu1
* Merge from debian unstable
* debian/libopencryptoki0.install, debian/libopencryptoki-dev.install: 
  - removed /usr/lib/opencryptoki/stdll/*, it's empty now
 

Show diffs side-by-side

added added

removed removed

Lines of Context:
usr/lib/pkcs11/api/apiutil.c
357
357
#ifdef DEBUG
358
358
#define LOGIT  logit
359
359
#else
360
 
#define LOGIT  
 
360
#define LOGIT(...) 
361
361
#endif
362
362
 
363
363
#define SYSLOG
859
859
   }
860
860
 
861
861
#ifdef PKCS64
862
 
   bzero((char *)procp,sizeof(Slot_Mgr_Proc_t_64));
 
862
   memset((char *)procp, 0, sizeof(Slot_Mgr_Proc_t_64));
863
863
#else
864
 
   bzero((char *)procp,sizeof(Slot_Mgr_Proc_t));
 
864
   memset((char *)procp, 0, sizeof(Slot_Mgr_Proc_t));
865
865
#endif
866
866
   procp->inuse = TRUE;
867
867
   procp->proc_id = getpid();
910
910
   procp = &(shm->proc_table[Anchor->MgrProcIndex]);
911
911
 
912
912
#ifdef PKCS64
913
 
   bzero((char *)procp,sizeof(Slot_Mgr_Proc_t_64));
 
913
   memset((char *)procp, 0, sizeof(Slot_Mgr_Proc_t_64));
914
914
#else
915
 
   bzero((char *)procp,sizeof(Slot_Mgr_Proc_t));
 
915
   memset((char *)procp, 0, sizeof(Slot_Mgr_Proc_t));
916
916
#endif
917
917
 
918
918
   Anchor->MgrProcIndex=0;
986
986
   DLL_Load_t  *dllload;
987
987
{
988
988
   int i;
989
 
   char *dname;
990
989
 
991
990
 LOGIT(LOG_DEBUG,"DL_LOAD");
992
991
 
1011
1010
      dllload[i].dll_load_count=1;;
1012
1011
 
1013
1012
   } else {
 
1013
           syslog(LOG_ERR, "%s: dlopen() failed for [%s]; dlerror = [%s]\n",
 
1014
                           __FUNCTION__, sinfp->dll_location, dlerror());
1014
1015
      LOGIT(LOG_DEBUG,"\tDL_Load of %s failed, dlerror: %s",sinfp->dll_location,dlerror());
1015
1016
      sltp->dlop_p = NULL;
1016
1017
      return 0;